@@ -69,9 +69,12 @@ |
||
| 69 | 69 | $this->cache[$user->id][$groups] = false; |
| 70 | 70 | $context = $this->context->get( false ); |
| 71 | 71 | |
| 72 | - try { |
|
| 72 | + try |
|
| 73 | + { |
|
| 73 | 74 | $site = \Aimeos\MShop::create( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); |
| 74 | - } catch( \Exception $e ) { |
|
| 75 | + } |
|
| 76 | + catch( \Exception $e ) |
|
| 77 | + { |
|
| 75 | 78 | $site = ( Route::current() ? Route::input( 'site', Request::get( 'site', 'default' ) ) : 'default' ); |
| 76 | 79 | } |
| 77 | 80 | |
@@ -4,72 +4,72 @@ |
||
| 4 | 4 | { |
| 5 | 5 | public function testCountAction() |
| 6 | 6 | { |
| 7 | - View::addLocation(dirname(__DIR__).'/fixtures/views'); |
|
| 7 | + View::addLocation( dirname( __DIR__ ) . '/fixtures/views' ); |
|
| 8 | 8 | |
| 9 | - $response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@countAction', ['site' => 'unittest']); |
|
| 9 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@countAction', ['site' => 'unittest'] ); |
|
| 10 | 10 | |
| 11 | 11 | $this->assertResponseOk(); |
| 12 | - $this->assertContains('.catalog-filter-count', $response->getContent()); |
|
| 13 | - $this->assertContains('.catalog-filter-attribute', $response->getContent()); |
|
| 12 | + $this->assertContains( '.catalog-filter-count', $response->getContent() ); |
|
| 13 | + $this->assertContains( '.catalog-filter-attribute', $response->getContent() ); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | public function testDetailAction() |
| 18 | 18 | { |
| 19 | - View::addLocation(dirname(__DIR__).'/fixtures/views'); |
|
| 19 | + View::addLocation( dirname( __DIR__ ) . '/fixtures/views' ); |
|
| 20 | 20 | |
| 21 | - $response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@detailAction', ['site' => 'unittest', 'd_name' => 'Cafe_Noire_Cappuccino']); |
|
| 21 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@detailAction', ['site' => 'unittest', 'd_name' => 'Cafe_Noire_Cappuccino'] ); |
|
| 22 | 22 | |
| 23 | 23 | $this->assertResponseOk(); |
| 24 | - $this->assertContains('<section class="aimeos catalog-stage"', $response->getContent()); |
|
| 25 | - $this->assertContains('<section class="aimeos catalog-detail"', $response->getContent()); |
|
| 26 | - $this->assertContains('<section class="aimeos catalog-session"', $response->getContent()); |
|
| 24 | + $this->assertContains( '<section class="aimeos catalog-stage"', $response->getContent() ); |
|
| 25 | + $this->assertContains( '<section class="aimeos catalog-detail"', $response->getContent() ); |
|
| 26 | + $this->assertContains( '<section class="aimeos catalog-session"', $response->getContent() ); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | public function testListAction() |
| 31 | 31 | { |
| 32 | - View::addLocation(dirname(__DIR__).'/fixtures/views'); |
|
| 32 | + View::addLocation( dirname( __DIR__ ) . '/fixtures/views' ); |
|
| 33 | 33 | |
| 34 | - $response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@listAction', ['site' => 'unittest']); |
|
| 34 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@listAction', ['site' => 'unittest'] ); |
|
| 35 | 35 | |
| 36 | 36 | $this->assertResponseOk(); |
| 37 | - $this->assertContains('<section class="aimeos catalog-filter"', $response->getContent()); |
|
| 38 | - $this->assertContains('<section class="aimeos catalog-list"', $response->getContent()); |
|
| 37 | + $this->assertContains( '<section class="aimeos catalog-filter"', $response->getContent() ); |
|
| 38 | + $this->assertContains( '<section class="aimeos catalog-list"', $response->getContent() ); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | public function testStockAction() |
| 43 | 43 | { |
| 44 | - View::addLocation(dirname(__DIR__).'/fixtures/views'); |
|
| 44 | + View::addLocation( dirname( __DIR__ ) . '/fixtures/views' ); |
|
| 45 | 45 | |
| 46 | - $response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@stockAction', ['site' => 'unittest']); |
|
| 46 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@stockAction', ['site' => 'unittest'] ); |
|
| 47 | 47 | |
| 48 | 48 | $this->assertResponseOk(); |
| 49 | - $this->assertContains('.aimeos .product .stock', $response->getContent()); |
|
| 49 | + $this->assertContains( '.aimeos .product .stock', $response->getContent() ); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | public function testSuggestAction() |
| 54 | 54 | { |
| 55 | - View::addLocation(dirname(__DIR__).'/fixtures/views'); |
|
| 55 | + View::addLocation( dirname( __DIR__ ) . '/fixtures/views' ); |
|
| 56 | 56 | |
| 57 | - $response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@suggestAction', ['site' => 'unittest'], ['f_search' => 'Cafe']); |
|
| 57 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@suggestAction', ['site' => 'unittest'], ['f_search' => 'Cafe'] ); |
|
| 58 | 58 | |
| 59 | 59 | $this->assertResponseOk(); |
| 60 | - $this->assertRegexp('/[{.*}]/', $response->getContent()); |
|
| 60 | + $this->assertRegexp( '/[{.*}]/', $response->getContent() ); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | public function testTreeAction() |
| 65 | 65 | { |
| 66 | - View::addLocation(dirname(__DIR__).'/fixtures/views'); |
|
| 66 | + View::addLocation( dirname( __DIR__ ) . '/fixtures/views' ); |
|
| 67 | 67 | |
| 68 | - $response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@treeAction', ['site' => 'unittest', 'f_catid' => 1, 'f_name' => 'test']); |
|
| 68 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@treeAction', ['site' => 'unittest', 'f_catid' => 1, 'f_name' => 'test'] ); |
|
| 69 | 69 | |
| 70 | 70 | $this->assertResponseOk(); |
| 71 | - $this->assertContains('<section class="aimeos catalog-filter', $response->getContent()); |
|
| 72 | - $this->assertContains('<section class="aimeos catalog-stage', $response->getContent()); |
|
| 73 | - $this->assertContains('<section class="aimeos catalog-list', $response->getContent()); |
|
| 71 | + $this->assertContains( '<section class="aimeos catalog-filter', $response->getContent() ); |
|
| 72 | + $this->assertContains( '<section class="aimeos catalog-stage', $response->getContent() ); |
|
| 73 | + $this->assertContains( '<section class="aimeos catalog-list', $response->getContent() ); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | \ No newline at end of file |