-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1823 from SEED-platform/develop
Release 2.4.2
- Loading branch information
Showing
476 changed files
with
3,445 additions
and
2,776 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| # .git # For now add in the .git repo so that the version is parsed on the page correctly | ||
| .dockerignore | ||
| .idea | ||
| .tox | ||
| ./docker-compose*.yml | ||
| ./deploy.sh | ||
| **/*.pyc | ||
| collected_static | ||
| docs | ||
| media | ||
| node_modules | ||
| seed/static/vendors | ||
| vendors/node_modules | ||
| config/settings/local_untracked.py | ||
| config/settings/local_untracked.py.dist | ||
| /deploy.sh | ||
| /docker-*.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,125 +1,124 @@ | ||
|
|
||
| var tmp = require('tmp'); | ||
| module.exports = function(grunt) { | ||
| grunt.initConfig({ | ||
| // connect: { | ||
| // options: { | ||
| // port: 8000, | ||
| // hostname: 'localhost' | ||
| // }, | ||
| // runtime: { | ||
| // options: { | ||
| // middleware: function (connect) { | ||
| // return [ | ||
| // lrSnippet, | ||
| // mountFolder(connect, 'protractorInstrumented'), | ||
| // mountFolder(connect, '.......') | ||
| // ]; | ||
| // } | ||
| // } | ||
| // } | ||
| module.exports = function (grunt) { | ||
| grunt.initConfig({ | ||
| // connect: { | ||
| // options: { | ||
| // port: 8000, | ||
| // hostname: 'localhost' | ||
| // }, | ||
| // runtime: { | ||
| // options: { | ||
| // middleware: function (connect) { | ||
| // return [ | ||
| // lrSnippet, | ||
| // mountFolder(connect, 'protractorInstrumented'), | ||
| // mountFolder(connect, '.......') | ||
| // ]; | ||
| // } | ||
| // } | ||
| // } | ||
| // | ||
| // // Before generating any new files, remove any previously-created files. | ||
| // }, | ||
| clean: { | ||
| options: { | ||
| force: true | ||
| }, | ||
| tests: ['tmp', 'build', 'protractorInstrumented', 'protractorCoverage', 'protractorReports', 'protractorSaved'] | ||
| }, | ||
| connect: { | ||
| server: { | ||
| options: { | ||
| port: 3000, | ||
| base: 'protractorInstrumented/seed/static/seed/js' | ||
| } | ||
| } | ||
| }, | ||
| instrument: { | ||
| files: ['seed/static/seed/js/**/*.js', '!seed/static/seed/js/decorators/**/*.js', '!seed/static/seed/js/seed.js'], | ||
| options: { | ||
| lazy: true, | ||
| basePath: "protractorInstrumented" | ||
| } | ||
| }, | ||
| copy: { | ||
| save: { | ||
| expand: true, | ||
| cwd: 'seed/static/seed/js', | ||
| src: '**', | ||
| dest: 'protractorSaved/' | ||
| }, | ||
| instrument: { | ||
| expand: true, | ||
| cwd: 'protractorInstrumented/seed/static/seed/js', | ||
| src: '**', | ||
| dest: 'seed/static/seed/js/' | ||
| }, | ||
| copyBack: { | ||
| expand: true, | ||
| cwd: 'protractorSaved', | ||
| src: '**', | ||
| dest: 'seed/static/seed/js/' | ||
| } | ||
| }, | ||
| protractor_coverage: { | ||
| options: { | ||
| keepAlive: false, // If false, the grunt process stops when the test fails. | ||
| noColor: false, | ||
| coverageDir: 'protractorCoverage', | ||
| args: { | ||
| baseUrl: 'http://localhost:8000' | ||
| } | ||
| }, | ||
| local: { | ||
| options: { | ||
| configFile: 'seed/static/seed/tests/protractor-tests/protractorConfigCoverage.js' | ||
| } | ||
| } | ||
| }, | ||
| makeReport: { | ||
| src: 'protractorCoverage/**/*.json', | ||
| options: { | ||
| type: 'lcov', | ||
| dir: 'protractorReports', | ||
| print: '' | ||
| } | ||
| }, | ||
| coveralls: { | ||
| main: { | ||
| src: 'protractorReports/**/*.info', | ||
| options: { | ||
| force: true | ||
| } | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| // Before generating any new files, remove any previously-created files. | ||
| // }, | ||
| clean: { | ||
| options: { | ||
| force:true | ||
| }, | ||
| tests: ['tmp', 'build', 'protractorInstrumented', 'protractorCoverage', 'protractorReports', 'protractorSaved'], | ||
| }, | ||
| connect: { | ||
| server: { | ||
| options: { | ||
| port: 3000, | ||
| base: 'protractorInstrumented/seed/static/seed/js' | ||
| } | ||
| }, | ||
| }, | ||
| instrument: { | ||
| files: ['seed/static/seed/js/**/*.js','!seed/static/seed/js/decorators/**/*.js', '!seed/static/seed/js/seed.js'], | ||
| options: { | ||
| lazy: true, | ||
| basePath: "protractorInstrumented" | ||
| } | ||
| }, | ||
| copy: { | ||
| 'save': { | ||
| expand: true, | ||
| cwd: 'seed/static/seed/js', | ||
| src: '**', | ||
| dest: 'protractorSaved/' | ||
| }, | ||
| 'instrument': { | ||
| expand: true, | ||
| cwd: 'protractorInstrumented/seed/static/seed/js', | ||
| src: '**', | ||
| dest: 'seed/static/seed/js/' | ||
| }, | ||
| 'copyBack': { | ||
| expand: true, | ||
| cwd: 'protractorSaved', | ||
| src: '**', | ||
| dest: 'seed/static/seed/js/' | ||
| }, | ||
| }, | ||
| protractor_coverage: { | ||
| options: { | ||
| keepAlive: false, // If false, the grunt process stops when the test fails. | ||
| noColor: false, | ||
| coverageDir: 'protractorCoverage', | ||
| args: { | ||
| baseUrl: 'http://localhost:8000' | ||
| } | ||
| }, | ||
| local: { | ||
| options: { | ||
| configFile: 'seed/static/seed/tests/protractor-tests/protractorConfigCoverage.js' | ||
| } | ||
| } | ||
| }, | ||
| makeReport: { | ||
| src: 'protractorCoverage/**/*.json', | ||
| options: { | ||
| type: 'lcov', | ||
| dir: 'protractorReports', | ||
| print: '' | ||
| } | ||
| }, | ||
| coveralls: { | ||
| main:{ | ||
| src: 'protractorReports/**/*.info', | ||
| options: { | ||
| force: true | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| // Actually load this plugin's task(s). | ||
| // grunt.loadTasks('tasks'); | ||
|
|
||
| // Actually load this plugin's task(s). | ||
| // grunt.loadTasks('tasks'); | ||
| // These plugins provide necessary tasks. | ||
| grunt.loadNpmTasks('grunt-protractor-coverage'); | ||
| grunt.loadNpmTasks('grunt-contrib-clean'); | ||
| grunt.loadNpmTasks('grunt-contrib-copy'); | ||
| grunt.loadNpmTasks('grunt-istanbul'); | ||
| grunt.loadNpmTasks('grunt-coveralls'); | ||
|
|
||
| // These plugins provide necessary tasks. | ||
| grunt.loadNpmTasks('grunt-protractor-coverage'); | ||
| grunt.loadNpmTasks('grunt-contrib-clean'); | ||
| grunt.loadNpmTasks('grunt-contrib-copy'); | ||
| grunt.loadNpmTasks('grunt-istanbul'); | ||
| grunt.loadNpmTasks('grunt-coveralls'); | ||
| // Whenever the "test" task is run, first clean the "tmp" dir, then run this | ||
| // plugin's task(s), then test the result. | ||
|
|
||
| // Whenever the "test" task is run, first clean the "tmp" dir, then run this | ||
| // plugin's task(s), then test the result. | ||
| //same as npm test more or less | ||
| // grunt.registerTask('coverage', ['protractor_coverage:local']); | ||
|
|
||
| //same as npm test more or less | ||
| // grunt.registerTask('coverage', ['protractor_coverage:local']); | ||
|
|
||
| //don't use instrumented code | ||
| // grunt.registerTask('coverage', ['clean', 'copy:save', 'instrument', 'protractor_coverage:local', 'copy:copyBack']); | ||
| //don't use instrumented code | ||
| // grunt.registerTask('coverage', ['clean', 'copy:save', 'instrument', 'protractor_coverage:local', 'copy:copyBack']); | ||
|
|
||
| //without coveralls | ||
| grunt.registerTask('coverage', ['clean', 'copy:save', 'instrument', 'copy:instrument', 'protractor_coverage:local', 'copy:copyBack', 'makeReport']); | ||
| grunt.registerTask('report', ['makeReport']); | ||
| //without coveralls | ||
| grunt.registerTask('coverage', ['clean', 'copy:save', 'instrument', 'copy:instrument', 'protractor_coverage:local', 'copy:copyBack', 'makeReport']); | ||
| grunt.registerTask('report', ['makeReport']); | ||
|
|
||
| //with coveralls | ||
| // grunt.registerTask('coverage', ['clean', 'copy:save', 'instrument', 'copy:instrument', 'protractor_coverage:local', 'copy:copyBack', 'makeReport', 'coveralls']); | ||
| //with coveralls | ||
| // grunt.registerTask('coverage', ['clean', 'copy:save', 'instrument', 'copy:instrument', 'protractor_coverage:local', 'copy:copyBack', 'makeReport', 'coveralls']); | ||
|
|
||
| grunt.registerTask('test', ['coverage']); | ||
| grunt.registerTask('test', ['coverage']); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| #!/usr/bin/env bash | ||
| # installs npm and bower dependencies | ||
| # installs npm dependencies | ||
| # assumes npm is installed | ||
|
|
||
| echo "Installing npm dependencies from packages.json" | ||
| echo "Installing npm dependencies from package.json" | ||
| npm install | ||
| echo -e "\n\n\nInstalling bower dependencies from bower.json" | ||
| $(npm bin)/bower install --config.interactive=false --allow-root |
Oops, something went wrong.