Merge branch 'v2'

Author: anantn

.gitignore

@@ -1 +1,4 @@
+bower_components/
 node_modules/
+bower_components/
+selenium/

Gruntfile.js

@@ -6,7 +6,7 @@ module.exports = function(grunt) {
   grunt.initConfig({
     exec: {
       casperjs : {
-        command : 'casperjs test tests/'
+        command : 'casperjs test tests/e2e/'
       }
     },
 
@@ -61,14 +61,50 @@ module.exports = function(grunt) {
           message: 'Build Finished'
         }
       }
+    },
+    karma: {
+      unit: {
+        configFile: 'tests/karma.conf.js'
+      },
+      continuous: {
+        configFile: 'tests/karma.conf.js',
+        singleRun: true,
+        browsers: ['PhantomJS']
+      }
     }
-
   });
 
   require('load-grunt-tasks')(grunt);
 
   grunt.registerTask('build', ['jshint', 'uglify']);
-  grunt.registerTask('test', ['exec:casperjs']);
+  grunt.registerTask('test', ['exec:casperjs', 'karma:continuous']);
+
+  grunt.registerTask('protractor', 'e2e tests for omnibinder', function () {
+    var done = this.async();
+
+    if (!grunt.file.isDir('selenium')) {
+      grunt.log.writeln('Installing selenium and chromedriver dependency');
+      grunt.util.spawn({
+        cmd: './node_modules/protractor/bin/install_selenium_standalone'
+      }, function (err) {
+        if (err) grunt.log.error(err);
+
+        runProtractor();
+      });
+    } else {
+      runProtractor();
+    }
+
+    function runProtractor() {
+      grunt.util.spawn({
+        cmd: './node_modules/protractor/bin/protractor',
+        args: ['tests/protractorConf.js']
+      }, function (err, result, code) {
+        grunt.log.write(result);
+        done(err);
+      });
+    }
+  });
 
   grunt.registerTask('default', ['build', 'test']);
 };

README.md

@@ -22,6 +22,7 @@ If you'd like to hack on AngularFire itself, you'll need
 ```bash
 brew install casperjs
 npm install
+bower install
 ```
 
 Use grunt to build and test the code: