Merge pull request #4 from sergerdn/feature/travis-js
add make test-js to Travis, minor modification in gulp build
This commit is contained in:
sergerdn
GitHub
commit
83e6d153a5
14
.travis.yml
14
.travis.yml
|
|
@ -10,6 +10,9 @@ jobs:
|
|||
env: TOXENV=py37
|
||||
addons:
|
||||
postgresql: "9.4"
|
||||
chrome: stable
|
||||
services:
|
||||
- xvfb
|
||||
- name: "python3.7-postgresql-10-bionic"
|
||||
dist: bionic
|
||||
language: python
|
||||
|
|
@ -17,6 +20,7 @@ jobs:
|
|||
env: TOXENV=py37
|
||||
addons:
|
||||
postgresql: '10'
|
||||
chrome: stable
|
||||
apt:
|
||||
packages:
|
||||
- postgresql-10
|
||||
|
|
@ -24,6 +28,7 @@ jobs:
|
|||
- postgresql-server-dev-10
|
||||
services:
|
||||
- postgresql
|
||||
- xvfb
|
||||
- name: "python3.8-postgresql-12-focal"
|
||||
dist: focal
|
||||
language: python
|
||||
|
|
@ -31,6 +36,7 @@ jobs:
|
|||
env: TOXENV=py38
|
||||
addons:
|
||||
postgresql: '12'
|
||||
chrome: stable
|
||||
apt:
|
||||
packages:
|
||||
- postgresql-12
|
||||
|
|
@ -38,6 +44,7 @@ jobs:
|
|||
- postgresql-server-dev-12
|
||||
services:
|
||||
- postgresql
|
||||
- xvfb
|
||||
|
||||
cache:
|
||||
directories:
|
||||
|
|
@ -53,6 +60,9 @@ env:
|
|||
# https://github.com/travis-ci/travis-ci/issues/5246#issuecomment-166460882
|
||||
- BOTO_CONFIG=/doesnotexist
|
||||
|
||||
before_install:
|
||||
- export CHROME_BIN=/usr/bin/google-chrome
|
||||
|
||||
before_script:
|
||||
- sudo systemctl stop postgresql
|
||||
# the port may have been auto-configured to use 5433 if it thought 5422 was already in use,
|
||||
|
|
@ -64,8 +74,9 @@ before_script:
|
|||
- psql -c "create user lemur with password 'lemur;'" -U postgres
|
||||
- psql lemur -c "create extension IF NOT EXISTS pg_trgm;" -U postgres
|
||||
- npm config set registry https://registry.npmjs.org
|
||||
- npm install -g bower
|
||||
- npm install -g npm@latest bower
|
||||
- pip install --upgrade setuptools
|
||||
- export DISPLAY=:99.0
|
||||
|
||||
install:
|
||||
- pip install coveralls
|
||||
|
|
@ -74,6 +85,7 @@ install:
|
|||
script:
|
||||
- make test
|
||||
- bandit -r . -ll -ii -x lemur/tests/,docs
|
||||
- make test-js
|
||||
|
||||
after_success:
|
||||
- coveralls
|
||||
|
|
|
|||
|
|
@ -28,6 +28,23 @@ var gulp = require('gulp'),
|
|||
replace = require('gulp-replace'),
|
||||
argv = require('yargs').argv;
|
||||
|
||||
// http://stackoverflow.com/questions/1144783/replacing-all-occurrences-of-a-string-in-javascript
|
||||
function escapeRegExp(string) {
|
||||
return string.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1');
|
||||
}
|
||||
|
||||
function replaceAll(string, find, replace) {
|
||||
return string.replace(new RegExp(escapeRegExp(find), 'g'), replace);
|
||||
}
|
||||
|
||||
function stringSrc(filename, string) {
|
||||
let src = require('stream').Readable({objectMode: true});
|
||||
src._read = function () {
|
||||
this.push(new gutil.File({cwd: '', base: '', path: filename, contents: new Buffer(string)}));
|
||||
this.push(null);
|
||||
};
|
||||
return src;
|
||||
}
|
||||
|
||||
gulp.task('clean', function (done) {
|
||||
del(['.tmp', 'lemur/static/dist'], done);
|
||||
|
|
@ -39,12 +56,18 @@ gulp.task('default', gulp.series(['clean'], function () {
|
|||
}));
|
||||
|
||||
gulp.task('test', function (done) {
|
||||
// returning the promise
|
||||
return new karma.Server({
|
||||
new karma.Server({
|
||||
configFile: __dirname + '/karma.conf.js',
|
||||
singleRun: true
|
||||
}, function() {
|
||||
}, function (err) {
|
||||
if (err === 0) {
|
||||
done();
|
||||
} else {
|
||||
// if karma server failed to start raise error
|
||||
done(new gutil.PluginError('karma', {
|
||||
message: 'Karma Tests failed'
|
||||
}));
|
||||
}
|
||||
}).start();
|
||||
});
|
||||
|
||||
|
|
@ -73,7 +96,7 @@ gulp.task('dev:styles', function () {
|
|||
return fileName.indexOf(suffix) === 0;
|
||||
};
|
||||
|
||||
var fileList = [
|
||||
let fileList = [
|
||||
'bower_components/bootswatch/sandstone/bootswatch.less',
|
||||
'bower_components/fontawesome/css/font-awesome.css',
|
||||
'bower_components/angular-chart.js/dist/angular-chart.css',
|
||||
|
|
@ -89,10 +112,8 @@ gulp.task('dev:styles', function () {
|
|||
return gulp.src(fileList)
|
||||
.pipe(gulpif(isBootswatchFile, foreach(function (stream, file) {
|
||||
let themeName = path.basename(path.dirname(file.path)),
|
||||
content = replaceAll(baseContent, '$theme$', themeName),
|
||||
file2 = string_src('bootstrap-' + themeName + '.less', content);
|
||||
|
||||
return file2;
|
||||
content = replaceAll(baseContent, '$theme$', themeName);
|
||||
return stringSrc('bootstrap-' + themeName + '.less', content);
|
||||
})))
|
||||
.pipe(less())
|
||||
.pipe(gulpif(isBootstrapFile, foreach(function (stream, file) {
|
||||
|
|
@ -112,24 +133,6 @@ gulp.task('dev:styles', function () {
|
|||
.pipe(size());
|
||||
});
|
||||
|
||||
// http://stackoverflow.com/questions/1144783/replacing-all-occurrences-of-a-string-in-javascript
|
||||
function escapeRegExp(string) {
|
||||
return string.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1');
|
||||
}
|
||||
|
||||
function replaceAll(string, find, replace) {
|
||||
return string.replace(new RegExp(escapeRegExp(find), 'g'), replace);
|
||||
}
|
||||
|
||||
function string_src(filename, string) {
|
||||
let src = require('stream').Readable({ objectMode: true });
|
||||
src._read = function () {
|
||||
this.push(new gutil.File({ cwd: '', base: '', path: filename, contents: new Buffer(string) }));
|
||||
this.push(null);
|
||||
};
|
||||
return src;
|
||||
}
|
||||
|
||||
gulp.task('dev:scripts', function () {
|
||||
return gulp.src(['lemur/static/app/angular/**/*.js'])
|
||||
.pipe(jshint())
|
||||
|
|
@ -236,22 +239,22 @@ gulp.task('addUrlContextPath:revision', function(){
|
|||
.pipe(rev())
|
||||
.pipe(gulp.dest('lemur/static/dist'))
|
||||
.pipe(rev.manifest())
|
||||
.pipe(gulp.dest('lemur/static/dist'))
|
||||
.pipe(gulp.dest('lemur/static/dist'));
|
||||
});
|
||||
|
||||
gulp.task('addUrlContextPath:revreplace', gulp.series(['addUrlContextPath:revision'], function () {
|
||||
return gulp.src( "lemur/static/dist/index.html")
|
||||
return gulp.src('lemur/static/dist/index.html')
|
||||
.pipe(gulp.dest('lemur/static/dist'));
|
||||
}));
|
||||
|
||||
gulp.task('addUrlContextPath', gulp.series(['addUrlContextPath:revreplace'], function () {
|
||||
let urlContextPathExists = argv.urlContextPath ? true : false;
|
||||
let urlContextPathExists = !!argv.urlContextPath;
|
||||
return gulp.src(['lemur/static/dist/scripts/main*.js', 'lemur/static/dist/angular/**/*.html'])
|
||||
.pipe(gulpif(urlContextPathExists, replace('api/', argv.urlContextPath + '/api/')))
|
||||
.pipe(gulpif(urlContextPathExists, replace('/angular/', '/' + argv.urlContextPath + '/angular/')))
|
||||
.pipe(gulp.dest(function (file) {
|
||||
return file.base;
|
||||
}))
|
||||
}));
|
||||
}));
|
||||
|
||||
gulp.task('build', gulp.series(['build:images', 'build:fonts', 'build:html', 'build:extras']));
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
// Contents of: config/karma.conf.js
|
||||
'use strict';
|
||||
|
||||
module.exports = function (config) {
|
||||
config.set({
|
||||
basePath: '../',
|
||||
|
||||
// Fix for "JASMINE is not supported anymore" warning
|
||||
frameworks : ["jasmine"],
|
||||
frameworks: ['jasmine'],
|
||||
|
||||
files: [
|
||||
'app/lib/angular/angular.js',
|
||||
|
|
@ -16,12 +18,20 @@ module.exports = function (config) {
|
|||
|
||||
autoWatch: true,
|
||||
|
||||
browsers : ['Chrome'],
|
||||
browsers: [process.env.TRAVIS ? 'Chrome_travis_ci' : 'Chrome'],
|
||||
customLaunchers: {
|
||||
'Chrome_travis_ci': {
|
||||
base: 'Chrome',
|
||||
flags: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-gpu',],
|
||||
},
|
||||
},
|
||||
|
||||
junitReporter: {
|
||||
outputFile: 'test_out/unit.xml',
|
||||
suite: 'unit'
|
||||
//...
|
||||
}
|
||||
},
|
||||
|
||||
failOnEmptyTestSuite: false,
|
||||
});
|
||||
};
|
||||
|
|
@ -37,11 +37,10 @@
|
|||
"gulp-size": "^2.1.0",
|
||||
"gulp-uglify": "^2.0.0",
|
||||
"gulp-useref": "^3.1.2",
|
||||
"gulp-util": "^3.0.1",
|
||||
"http-proxy": ">=1.18.1",
|
||||
"jshint-stylish": "^2.2.1",
|
||||
"karma": "^5.2.3",
|
||||
"karma-jasmine": "^1.1.0",
|
||||
"karma": "^6.0.3",
|
||||
"karma-jasmine": "^4.0.1",
|
||||
"main-bower-files": "^2.13.1",
|
||||
"merge-stream": "^1.0.1",
|
||||
"require-dir": "~0.3.0",
|
||||
|
|
@ -59,7 +58,8 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-util": "^3.0.8",
|
||||
"jshint": "^2.11.0",
|
||||
"karma-chrome-launcher": "^2.0.0"
|
||||
"karma-chrome-launcher": "^3.1.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue