Run local ptor tests in Firefox

Travis can run FF but not Chrome
robbie-PL · Jul 3, 2014 · 6ee8b22 · 6ee8b22
1 parent eb8682e
commit 6ee8b22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -78,11 +78,12 @@ module.exports = function(grunt) {
     // End to end (e2e) tests
     protractor: {
       options: {
-        configFile: "tests/protractor.conf.js"
+        configFile: "tests/local_protractor.conf.js"
       },
       singlerun: {},
       saucelabs: {
         options: {
+          configFile: "tests/sauce_protractor.conf.js",
           args: {
             sauceUser: process.env.SAUCE_USERNAME,
             sauceKey: process.env.SAUCE_ACCESS_KEY
@@ -109,18 +110,18 @@ module.exports = function(grunt) {
   grunt.registerTask('update', ['shell:npm_install', 'shell:bower_install']);
 
   // Single run tests
-  grunt.registerTask('test', ['test:unit', 'test:unit:sauce', 'test:e2e']);
+  grunt.registerTask('test', ['test:unit', 'test:e2e']);
   grunt.registerTask('test:unit', ['karma:singlerun']);
-  grunt.registerTask('test:unit:sauce', ['karma:saucelabs']);
   grunt.registerTask('test:e2e', ['connect:testserver', 'protractor:singlerun']);
 
+  // Sauce tasks
+  grunt.registerTask('sauce:unit', ['karma:saucelabs']);
+  grunt.registerTask('sauce:e2e', ['connect:testserver', 'protractor:saucelabs']);
+
   // Watch tests
   grunt.registerTask('test:watch', ['karma:watch']);
   grunt.registerTask('test:watch:unit', ['karma:watch']);
 
-  // Travis CI testing
-  grunt.registerTask('travis', ['build', 'test:unit', 'connect:testserver', 'protractor:saucelabs']);
-
   // Build tasks
   grunt.registerTask('build', ['jshint', 'uglify']);
 

diff --git a/tests/protractor.conf.js → tests/local_protractor.conf.js b/tests/protractor.conf.js → tests/local_protractor.conf.js
@@ -12,10 +12,7 @@ exports.config = {
   // Capabilities to be passed to the webdriver instance
   // For a full list of available capabilities, see https://code.google.com/p/selenium/wiki/DesiredCapabilities
   capabilities: {
-    'browserName': 'chrome',
-    'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
-    'build': process.env.TRAVIS_BUILD_NUMBER,
-    'name': 'AngularFire Protractor Tests Build ' + process.env.TRAVIS_BUILD_NUMBER
+    'browserName': 'firefox',
   },
 
   // Calls to protractor.get() with relative paths will be prepended with the baseUrl
@@ -37,4 +34,4 @@ exports.config = {
     // Default time to wait in ms before a test fails.
     defaultTimeoutInterval: 20000
   }
-};
+};