Fixed frontend tests setup

softformance · Mar 22, 2018 · 335d5fb · 335d5fb
1 parent 1378d6b
commit 335d5fb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,13 +8,6 @@ addons:
     - enchant
 
 env:
-  global:
-    # encrypted Sauce Labs sub-account user name
-    - secure: dMNs8zHP+CRy7JeHy1x6YJHGfIeOLWFr04dMU/A/tP6D8zKOBiOybCiSdJTKdxXNTN3tyskjH/z1oZbeyFcsW4zUZWT5pa6aA+tc00z9CHrkHIdMyUQ1+FQmSU5AWYPjfuNL+h5LkYIoB7pP4jDPgMRxOz52yCUuhF/ICi85ccTnK94ul04vemyLzps7c3Ea5oWGt3BnsB3tiK1ZeSnFTRxTzDLmx+apWTEIQToqr3hDu0kgMi20d6XsHBMcb2jI9BPI7cSf8/NLqSoJfMPd9Yrfm7GHHzNT5+8RIqyGAsAUoOoJODwKs/LWoti2FOsfaKnUDIIhriP/5Exxr90hXmaMl5IIuJRn/EQ60Vq5RJfvSIbsTWvP/NU4U2+4BveN1D0i0DsLUNIjJ2oenBFAQ10itlrpgmVQSkC6AZhvBGaMK9g9EHkuCtmB7OxS3mj8ErcAlD1MKSy6kbpmKO7T1BojZM/PR+5501bQdWORB2oMA+YS7lFPXH/0GAh4WR7Dcy8W+TVBSuW7ATz6+UDivugqx0FAxITZamMVJz7neFT6cX3esyRj4H6oOlvwptpd/y8Cp0eeAnDMv2np23gkskUHxirVdBQ+DOpRMIWgZwvxwkuSDiJgbBdFrkWgWH+/PaCcsivg+IPUAQFHLAA2earf/i26sOKZVGSioEYpeE0=
-    # encrypted Sauce Labs sub-account token
-    - secure: ixXfxRCzSbp5gqgTeVavZIrJ6u/jHtIsANbZYmKtJFWNu68cG07NeUzFUNrZWj8eCM8MD09cMet2DWDC6oVj0oVv124WsJBTQu7KuzEZSWPyouPiM0PNDuunLm/HhAfZR3UTkjG6XznyI0R5JPdCg6zfDvt/twYRo9/hfMN07qk6ZWImuG8HsLvZn0/KHzVPXxIGue6UV8DRK4ZlQy4eIBRQtRgVvt1ZcoHU758/F4MAp3vGoSxjYI+8hAKfFAiOtdSC+GFGm/LcMPTO8Yxc/uUDque2Y4kyFDIRJjw4nq09Pj1/UZG7Ybpb0SHobE/gyMwBLgTPqqIbfgQhR1dX2rkcTuIxlSRlLpJ0q/x0XcjuTMqSmr3QJuQia25FSK0s8n63jCkHNW83tF1+434rckvzGFEmO2o03UDhx2p+zAHAbF91W1F+kNunoDiZyYsoh69foU6tOeVPEq1ilTSmhZWLYUp6yZ5BhY7vzBC8hiGaIQlPLS0+XvV/LeO+fkOEoq+QXp/wDQi9hPj7NQKdZ5LnKWeAxi+eBF7GnE6YpPaNS6cKXzNi6k1dGBopEUYujX2MpOrfin4OWrd6bB6g5HBr6lsGaFntWmusbNbrooau7YA0DkNv8q3jBj3yXewiBLrk2Cv3LQ/s5hYoThn/mq83Dhj90jFepekSBAC+E1Q=
-    # encrypted Code Climate token
-    - secure: rD+5DrqBv5NTkzbjmmh1ihs2lPnHlvdom6wU3m/tORYsn0eQvTS8zESGrTl72sP05g9z2y2+PbFQNaYtAkgTJn9Zw88pH0fvOdwN44ORA3L5hpsWRs2pYejTyKTsw+rQTQt1V3rODPhG23kBAKVDzT/3eruVBoBS4uusUA5h5W+cVvEkyZvvkqzhD/WYPtUYalq01DdUBn7FTxzycTfDOCFRVT5RW8cckIWiGJO1zcTorgN8uAlWYY5BV09VQ4Wdmxfa8+9UMrHqogJNI6KI2yVEXr+C9jFlMIvDQO18djLfXn6RuCINnWgJZitFY7Sf4F/IQmILBnOsPgfr+u1i9eR58LOYIS/JcxXkhASzeNsIHUSNzhY6m44Yk7b8P3X4bEXERw0jYAfonywaK6Pk1J4Yo9wFqZM00ueL8ym2hM48ijDPg7AyHviG6tdn7lRzT+yvk8Zmv1+5OWLsIu4MyqXqiN8/ZC7b2Qeio+yIStjfHZvychSLmdt8DbuNVuKHYh7auni5U3Rz1OcHFJ+rzordhp7X0Iq2O0UjMpRfev59bYGwRZMBwoNH43gHsWfHEAAPt7My49kUC66JTZOkFD+fZXBJh/0AjsMRJtahrbd9GQ7TP7MMqzUOiDsauB1rlyvcYPU+0esN8QKthZDedgcGLtzbmu7Y7Ujhc6RUw9g=
   matrix:
     # Matrix-size reduction strategies:
     #   PY strategy: do not test 3.3 on Travis at all. (keep in tox.ini though)
@@ -63,9 +56,8 @@ install:
   - pip install tox coveralls
 
 before_script:
-  - if [ "$FE" == 1 ]; then nvm install 0.12.7 && nvm use 0.12.7; fi
+  - if [ "$FE" == 1 ]; then nvm install 6 && nvm use 6; fi
   - if [ "$FE" == 1 ]; then npm config set spin false; fi
-  - if [ "$FE" == 1 ]; then npm install -g npm@2; fi
   - if [ "$FE" == 1 ]; then npm install -g [email protected]; fi
   - if [ "$FE" == 1 ]; then npm install -g codeclimate-test-reporter; fi
   - if [ "$FE" == 1 ]; then npm install; fi

diff --git a/aldryn_events/tests/frontend/base.conf.js b/aldryn_events/tests/frontend/base.conf.js
diff --git a/aldryn_events/tests/frontend/karma.conf.js b/aldryn_events/tests/frontend/karma.conf.js
@@ -7,23 +7,11 @@
 
 // #############################################################################
 // CONFIGURATION
-var baseConf = require('./base.conf');
-
 module.exports = function (config) {
     var browsers = {
         PhantomJS: 'used for local testing'
     };
 
-    // Browsers to run on Sauce Labs
-    // Check out https://saucelabs.com/platforms for all browser/OS combos
-    if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
-        browsers = baseConf.sauceLabsBrowsers.reduce(function (newBrowsers, capability) {
-            newBrowsers[JSON.stringify(capability)] = capability;
-            newBrowsers[JSON.stringify(capability)].base = 'SauceLabs';
-            return newBrowsers;
-        }, {});
-    }
-
     var settings = {
         // base path that will be used to resolve all patterns (eg. files, exclude)
         basePath: '..',
@@ -78,7 +66,7 @@ module.exports = function (config) {
         // test results reporter to use
         // possible values: 'dots', 'progress'
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'coverage', 'saucelabs'],
+        reporters: ['progress', 'coverage'],
 
         // web server port
         port: 9876,
@@ -103,13 +91,5 @@ module.exports = function (config) {
         singleRun: false
     };
 
-    if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
-        settings.sauceLabs = {
-            testName: baseConf.formatTaskName('Unit')
-        };
-        settings.captureTimeout = 240000;
-        settings.customLaunchers = browsers;
-    }
-
     config.set(settings);
 };
diff --git a/gulpfile.js b/gulpfile.js
@@ -13,6 +13,8 @@ var gutil = require('gulp-util');
 var KarmaServer = require('karma').Server;
 var eslint = require('gulp-eslint');
 var integrationTests = require('djangocms-casper-helpers/gulp');
+var path = require('path');
+var child_process = require('child_process');
 
 var argv = require('minimist')(process.argv.slice(2)); // eslint-disable-line
 
@@ -63,13 +65,18 @@ gulp.task('tests:unit', function (done) {
 });
 
 // gulp tests:integration [--clean] [--screenshots] [--tests=loginAdmin,toolbar]
+var pathToBin = child_process.execSync('npm bin').toString().trim();
+var pathToCasper = path.join(pathToBin, 'casperjs');
+
 gulp.task('tests:integration', integrationTests({
     tests: INTEGRATION_TESTS,
     pathToTests: PROJECT_PATH.tests,
     argv: argv,
     dbPath: 'local.sqlite',
     serverCommand: 'test_settings.py server',
-    logger: gutil.log.bind(gutil)
+    logger: gutil.log.bind(gutil),
+    waitForMigrations: 120,
+    pathToCasper: pathToCasper
 }));
 
 gulp.task('tests:watch', function () {

diff --git a/package.json b/package.json
@@ -2,8 +2,7 @@
   "name": "package",
   "private": true,
   "devDependencies": {
-    "browserslist-saucelabs": "^0.1.4",
-    "djangocms-casper-helpers": "^1.1.0",
+    "djangocms-casper-helpers": "^1.4.0",
     "gulp": "3.9.0",
     "gulp-eslint": "^2.0.0",
     "gulp-util": "3.0.6",
@@ -16,7 +15,6 @@
     "karma-jasmine": "^0.3.6",
     "karma-json-fixtures-preprocessor": "0.0.4",
     "karma-phantomjs-launcher": "^1.0.0",
-    "karma-sauce-launcher": "0.2.14",
     "minimist": "1.1.1",
     "phantomjs-prebuilt": "^2.1.7"
   }

diff --git a/tox.ini b/tox.ini
@@ -11,8 +11,6 @@ skip_missing_interpreters = True
 passenv =
     CI
     HOME
-    SAUCE_ACCESS_KEY
-    SAUCE_USERNAME
     TRAVIS_BUILD_NUMBER
     TRAVIS_PULL_REQUEST
     TRAVIS_REPO_SLUG