mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-24 06:35:49 +03:00
Merge pull request #3173 from ErisDS/issue-3171
Improve ember casper test stability
This commit is contained in:
Hannah Wolfe
commit
da8ea93d55
@ -18,5 +18,4 @@ before_install:
|
||||
- if [ $DB == "pg" ]; then npm install pg; psql -c 'create database ghost_testing;' -U postgres; fi
|
||||
before_script:
|
||||
- phantomjs --version
|
||||
- casperjs --version
|
||||
- grunt init
|
||||
- casperjs --version
|
||||
78
Gruntfile.js
78
Gruntfile.js
@ -384,37 +384,37 @@ var path = require('path'),
|
||||
// concatenate multiple JS files into a single file ready for use
|
||||
concat: {
|
||||
'dev': {
|
||||
files: {
|
||||
'core/built/scripts/vendor-ember.js': [
|
||||
'bower_components/loader.js/loader.js',
|
||||
'bower_components/jquery/dist/jquery.js',
|
||||
'bower_components/lodash/dist/lodash.js',
|
||||
'bower_components/handlebars/handlebars.js',
|
||||
'bower_components/ember/ember.js',
|
||||
'bower_components/ember-data/ember-data.js',
|
||||
'bower_components/ember-resolver/dist/ember-resolver.js',
|
||||
'bower_components/ic-ajax/dist/globals/main.js',
|
||||
'bower_components/ember-load-initializers/ember-load-initializers.js',
|
||||
'bower_components/validator-js/validator.js',
|
||||
'bower_components/codemirror/lib/codemirror.js',
|
||||
'bower_components/codemirror/addon/mode/overlay.js',
|
||||
'bower_components/codemirror/mode/markdown/markdown.js',
|
||||
'bower_components/codemirror/mode/gfm/gfm.js',
|
||||
'bower_components/showdown/src/showdown.js',
|
||||
'bower_components/moment/moment.js',
|
||||
'bower_components/keymaster/keymaster.js',
|
||||
'bower_components/device/lib/device.js',
|
||||
'bower_components/jquery-ui/ui/jquery-ui.js',
|
||||
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
|
||||
'bower_components/fastclick/lib/fastclick.js',
|
||||
'bower_components/nprogress/nprogress.js',
|
||||
'bower_components/ember-simple-auth/ember-simple-auth.js',
|
||||
'bower_components/ember-simple-auth/ember-simple-auth-oauth2.js',
|
||||
nonull: true,
|
||||
dest: 'core/built/scripts/vendor-ember.js',
|
||||
src: [
|
||||
'bower_components/loader.js/loader.js',
|
||||
'bower_components/jquery/dist/jquery.js',
|
||||
'bower_components/lodash/dist/lodash.js',
|
||||
'bower_components/handlebars/handlebars.js',
|
||||
'bower_components/ember/ember.js',
|
||||
'bower_components/ember-data/ember-data.js',
|
||||
'bower_components/ember-resolver/dist/ember-resolver.js',
|
||||
'bower_components/ic-ajax/dist/globals/main.js',
|
||||
'bower_components/ember-load-initializers/ember-load-initializers.js',
|
||||
'bower_components/validator-js/validator.js',
|
||||
'bower_components/codemirror/lib/codemirror.js',
|
||||
'bower_components/codemirror/addon/mode/overlay.js',
|
||||
'bower_components/codemirror/mode/markdown/markdown.js',
|
||||
'bower_components/codemirror/mode/gfm/gfm.js',
|
||||
'bower_components/showdown/src/showdown.js',
|
||||
'bower_components/moment/moment.js',
|
||||
'bower_components/keymaster/keymaster.js',
|
||||
'bower_components/device/lib/device.js',
|
||||
'bower_components/jquery-ui/ui/jquery-ui.js',
|
||||
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
|
||||
'bower_components/fastclick/lib/fastclick.js',
|
||||
'bower_components/nprogress/nprogress.js',
|
||||
'bower_components/ember-simple-auth/ember-simple-auth.js',
|
||||
'bower_components/ember-simple-auth/ember-simple-auth-oauth2.js',
|
||||
|
||||
'core/shared/lib/showdown/extensions/ghostimagepreview.js',
|
||||
'core/shared/lib/showdown/extensions/ghostgfm.js',
|
||||
]
|
||||
}
|
||||
'core/shared/lib/showdown/extensions/ghostimagepreview.js',
|
||||
'core/shared/lib/showdown/extensions/ghostgfm.js'
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
@ -553,14 +553,24 @@ var path = require('path'),
|
||||
// ### Validate
|
||||
// **Main testing task**
|
||||
//
|
||||
// `grunt validate` will lint and test your local Ghost codebase.
|
||||
// `grunt validate` will build, lint and test your local Ghost codebase.
|
||||
//
|
||||
// `grunt validate` is one of the most important and useful grunt tasks that we have available to use. It
|
||||
// manages the setup and running of jshint as well as the 4 test suites. See the individual sub tasks below
|
||||
// for details of each of the test suites.
|
||||
// manages the build of your environment and then calls `grunt test`
|
||||
//
|
||||
// `grunt validate` is called by `npm test`.
|
||||
// `grunt validate` is called by `npm test` and is used by Travis.
|
||||
grunt.registerTask('validate', 'Run tests and lint code',
|
||||
['init', 'test']);
|
||||
|
||||
// ### Test
|
||||
// **Main testing task**
|
||||
//
|
||||
// `grunt test` will lint and test your pre-built local Ghost codebase.
|
||||
//
|
||||
// `grunt test` runs jshint as well as the 4 test suites. See the individual sub tasks below for details of
|
||||
// each of the test suites.
|
||||
//
|
||||
grunt.registerTask('test', 'Run tests and lint code',
|
||||
['jshint', 'test-routes', 'test-unit', 'test-integration', 'test-functional']);
|
||||
|
||||
// ### Unit Tests *(sub task)*
|
||||
|
||||
13
bower.json
13
bower.json
@ -3,12 +3,12 @@
|
||||
"dependencies": {
|
||||
"codemirror": "4.0.1",
|
||||
"Countable": "2.0.2",
|
||||
"device": "matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
|
||||
"device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
|
||||
"ember": "1.5.0",
|
||||
"ember-data": "~1.0.0-beta.8",
|
||||
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
|
||||
"ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
|
||||
"ember-simple-auth": "https://github.com/simplabs/ember-simple-auth-component.git#0.5.3",
|
||||
"ember-simple-auth": "git://github.com/simplabs/ember-simple-auth-component.git#0.5.3",
|
||||
"fastclick": "1.0.0",
|
||||
"ghost-ui": "0.8.1",
|
||||
"handlebars": "1.3.0",
|
||||
@ -17,15 +17,12 @@
|
||||
"jquery-file-upload": "9.5.6",
|
||||
"jquery-hammerjs": "1.0.1",
|
||||
"jquery-ui": "1.10.4",
|
||||
"keymaster": "madrobby/keymaster#0f09fc1b7e66c2b7e07afe89a419366dcf2d1cd8",
|
||||
"loader.js": "stefanpenner/loader.js#1.0.0",
|
||||
"keymaster": "git://github.com/madrobby/keymaster#0f09fc1b7e66c2b7e07afe89a419366dcf2d1cd8",
|
||||
"loader.js": "git://github.com/stefanpenner/loader.js#1.0.0",
|
||||
"lodash": "2.4.1",
|
||||
"moment": "2.4.0",
|
||||
"nprogress": "0.1.2",
|
||||
"showdown": "https://github.com/ErisDS/showdown.git#v0.3.2-ghost",
|
||||
"showdown": "git://github.com/ErisDS/showdown.git#v0.3.2-ghost",
|
||||
"validator-js": "3.4.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"ember": "~1.4.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -72,13 +72,13 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"blanket": "~1.1.5",
|
||||
"bower": "~1.2.8",
|
||||
"bower": "~1.3.5",
|
||||
"grunt": "~0.4.1",
|
||||
"grunt-cli": "~0.1.13",
|
||||
"grunt-concat-sourcemap": "~0.4.0",
|
||||
"grunt-contrib-clean": "~0.5.0",
|
||||
"grunt-contrib-compress": "~0.5.2",
|
||||
"grunt-contrib-concat": "~0.3.0",
|
||||
"grunt-contrib-concat": "~0.4.0",
|
||||
"grunt-contrib-copy": "~0.4.1",
|
||||
"grunt-contrib-jshint": "~0.8.0",
|
||||
"grunt-contrib-uglify": "~0.2.5",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user