// fixed the selenium tests

marekhanus · Feb 5, 2016 · 3c7ad21 · 3c7ad21
1 parent 4f8ec20
commit 3c7ad21
Show file tree

Hide file tree

Showing 22 changed files with 11 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ download/*
 /vendor/*
 docs/phpdoc-sf/
 /composer.lock
-tests/StarterTheme/errorShots/
+tests/selenium/errorShots/
 
 admin-dev/autoupgrade/*
 admin-dev/backups/*
@@ -30,7 +30,7 @@ config/settings.inc.php
 config/settings.old.php
 config/xml/*
 !config/xml/themes/default.xml
-tests/StarterTheme/settings.js
+tests/selenium/settings.js
 themes/*/config/settings_*.json
 
 # Themes, modules and overrides

diff --git a/tests/StarterTheme/errorShots/.gitkeep b/tests/StarterTheme/errorShots/.gitkeep
diff --git a/tests/StarterTheme/.babelrc → tests/selenium/.babelrc b/tests/StarterTheme/.babelrc → tests/selenium/.babelrc
diff --git a/tests/StarterTheme/README.md → tests/selenium/README.md b/tests/StarterTheme/README.md → tests/selenium/README.md
diff --git a/tests/StarterTheme/commands/init.js → tests/selenium/commands/init.js b/tests/StarterTheme/commands/init.js → tests/selenium/commands/init.js
diff --git a/tests/StarterTheme/fixtures.js → tests/selenium/fixtures.js b/tests/StarterTheme/fixtures.js → tests/selenium/fixtures.js
diff --git a/tests/StarterTheme/helpers/checkout.js → tests/selenium/helpers/checkout.js b/tests/StarterTheme/helpers/checkout.js → tests/selenium/helpers/checkout.js
@@ -5,7 +5,7 @@ import fixtures from '../fixtures';
 export function addSomeProductToCart () {
     return browser
         .url(fixtures.urls.aCategoryWithProducts)
-        .click('[data-link-action="add-to-cart"]')
-        .waitForVisible('#blockcart-modal')
+        .click('.product-miniature:nth-of-type(2)')
+        .click('[name=add]')
     ;
 };
diff --git a/tests/StarterTheme/helpers/random-user.js → tests/selenium/helpers/random-user.js b/tests/StarterTheme/helpers/random-user.js → tests/selenium/helpers/random-user.js
diff --git a/tests/StarterTheme/package.json → tests/selenium/package.json b/tests/StarterTheme/package.json → tests/selenium/package.json
diff --git a/tests/StarterTheme/prepare-shop.php → tests/selenium/prepare-shop.php b/tests/StarterTheme/prepare-shop.php → tests/selenium/prepare-shop.php
@@ -71,11 +71,6 @@ function hookModule($moduleName, $hookName)
 
 // disableModule('blocklayered');
 disableModule('cheque'); // not yet working
-hookModule('blocktopmenu', 'displayTop');
-hookModule('blocklanguages', 'displayNav');
-hookModule('blockcurrencies', 'displayNav');
-hookModule('blockuserinfo', 'displayNav');
-hookModule('blocksearch', 'displayHeaderMiddle');
 
 // We need a customizable product: we add a single required text field to the product with id 1.
 

diff --git a/tests/StarterTheme/settings.dist.js → tests/selenium/settings.dist.js b/tests/StarterTheme/settings.dist.js → tests/selenium/settings.dist.js
diff --git a/tests/StarterTheme/settings.travis.js → tests/selenium/settings.travis.js b/tests/StarterTheme/settings.travis.js → tests/selenium/settings.travis.js
diff --git a/tests/StarterTheme/specs/blocktopmenu.js → tests/selenium/specs/blocktopmenu.js b/tests/StarterTheme/specs/blocktopmenu.js → tests/selenium/specs/blocktopmenu.js
diff --git a/tests/StarterTheme/specs/checkout.js → tests/selenium/specs/checkout.js b/tests/StarterTheme/specs/checkout.js → tests/selenium/specs/checkout.js
diff --git a/.../StarterTheme/specs/customer/addresses.js → tests/selenium/specs/customer/addresses.js b/.../StarterTheme/specs/customer/addresses.js → tests/selenium/specs/customer/addresses.js
diff --git a/...s/StarterTheme/specs/customer/identity.js → tests/selenium/specs/customer/identity.js b/...s/StarterTheme/specs/customer/identity.js → tests/selenium/specs/customer/identity.js
diff --git a/...StarterTheme/specs/customer/my-account.js → tests/selenium/specs/customer/my-account.js b/...StarterTheme/specs/customer/my-account.js → tests/selenium/specs/customer/my-account.js
diff --git a/...arterTheme/specs/customer/order-detail.js → ...s/selenium/specs/customer/order-detail.js b/...arterTheme/specs/customer/order-detail.js → ...s/selenium/specs/customer/order-detail.js
@@ -1,6 +1,6 @@
 /* global describe, it, browser, before, after */
 
-var fixtures = require('../../fixtures');
+import fixtures from '../../fixtures';
 
 describe('Order history page', function () {
 
@@ -15,7 +15,7 @@ describe('Order history page', function () {
   it('should display a list of orders', function () {
     return browser
         .url(fixtures.urls.orderhistory)
-        .elements('.page-content a.order-detail-link')
+        .elements('a[href*="controller=order-detail"]')
         .then(function (elements) {
           elements.value.length.should.be.greaterThan(0);
         })
@@ -25,7 +25,7 @@ describe('Order history page', function () {
   it('should allow customer to see details', function () {
     return browser
         .url(fixtures.urls.orderhistory)
-        .click('.page-content a.order-detail-link')
+        .click('a[href*="controller=order-detail"]')
         .isExisting('.page-content #order-infos')
         .then(function (isExisting) {
           isExisting.should.be.true;

diff --git a/tests/StarterTheme/specs/home-page.js → tests/selenium/specs/home-page.js b/tests/StarterTheme/specs/home-page.js → tests/selenium/specs/home-page.js
@@ -1,10 +1,12 @@
 /* global describe, it, browser */
 
+import {baseUrl} from '../settings';
+
 describe('The home page', function () {
   it('should contain a link with the logo', function () {
     return browser
       .url('/')
-      .element('a.logo img')
+      .isVisible('a[href^="' + baseUrl + '"] img')
     ;
   });
 });
diff --git a/tests/StarterTheme/specs/product-page.js → tests/selenium/specs/product-page.js b/tests/StarterTheme/specs/product-page.js → tests/selenium/specs/product-page.js
diff --git a/tests/StarterTheme/wdio.conf.js → tests/selenium/wdio.conf.js b/tests/StarterTheme/wdio.conf.js → tests/selenium/wdio.conf.js
diff --git a/travis-scripts/run-selenium-tests b/travis-scripts/run-selenium-tests
@@ -1,6 +1,6 @@
 rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 4
 /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_10.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :10 -ac -screen 0 1280x1024x16
-cd /var/www/prestashop.unit.test/tests/StarterTheme
+cd /var/www/prestashop.unit.test/tests/selenium
 mv settings.travis.js settings.js
 npm install
 DISPLAY=:10 npm run selenium &> /dev/null &