Skip to content

Commit

Permalink
[TEST] e2e: Run protractor directly instead of going thru mochaProtra…
Browse files Browse the repository at this point in the history
…ctor

See @darkdarkdragon suggestion on ripple#1766
  • Loading branch information
vhpoet committed Nov 6, 2014
1 parent 9632c27 commit fe267a1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 19 deletions.
16 changes: 0 additions & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-mocha-protractor');
grunt.loadNpmTasks('grunt-jade-l10n-extractor');
grunt.loadNpmTasks('grunt-bower-task');
grunt.loadNpmTasks('grunt-webfont');
Expand Down Expand Up @@ -342,18 +341,6 @@ module.exports = function(grunt) {
}
}
},
mochaProtractor: {
local: {
options: {
reporter: 'Spec',
browsers: ['Chrome'],
baseUrl: 'http://local.rippletrade.com/index_debug.html'
},
files: {
src: 'test/e2e/*.js'
}
}
},
bower: {
install: {
options: {
Expand Down Expand Up @@ -462,9 +449,6 @@ module.exports = function(grunt) {
// Node.js server to serve built files
grunt.registerTask('devserver', ['shell:startdevserver']);

// End-to-end tests
grunt.registerTask('e2e', ['connect:debug', 'mochaProtractor:local']);

// Start server with auto-recompilation
grunt.registerTask('serve', ['connect:debug', 'watch']);
};
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"jsdom": "~0.8.11",
"jade-l10n": "0.1.x",
"jade-l10n-loader": "0.0.x",
"grunt-mocha-protractor": "~0.5.0",
"json-loader": "~0.5.0",
"node-po": "~0.1.2",
"grunt-jade-l10n-extractor": "~0.1.2",
"grunt-bower-task": "~0.4.0",
"grunt-webfont": "~0.3.4",
"grunt-contrib-connect": "~0.5.0"
"grunt-contrib-connect": "~0.5.0",
"protractor": "~1.4.0"
},
"license": "ISC",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/protractor.conf-example.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
exports.config = {
seleniumAddress: 'http://localhost:4444/wd/hub',
specs: ['spec.js'],
framework: 'mocha',
specs: ['*.js'],
capabilities: {
browserName: 'chrome'
},
Expand Down

0 comments on commit fe267a1

Please sign in to comment.