Added browsername selection functionality

Updated README with end-to-end browser information

Gruntfile.js

@@ -203,11 +203,51 @@ module.exports = function(grunt) {
       }
     },
     protractor: {
-      test: {
+      options: {
+        configFile: 'test/functional/protractor.config.js'
+      },
+
+      chrome: {
         options: {
-          configFile: 'test/functional/protractor.config.js'
+          args: {
+            capabilities: {
+              browserName: 'chrome'
+            }
+          }
         }
-      }
+      },
+
+      firefox: {
+        options: {
+          args: {
+            capabilities: {
+              browserName: 'firefox'
+            }
+          }
+        }
+      },
+
+      safari: {
+        options: {
+          args: {
+            capabilities: {
+              browserName: 'safari'
+            }
+          }
+        }
+      },
+
+      ie: {
+        options: {
+          args: {
+            capabilities: {
+              browserName: 'internet explorer'
+            }
+          }
+        }
+      },
+
+      saucelabs:{}
     }
   });
 
@@ -307,20 +347,24 @@ module.exports = function(grunt) {
       grunt.task.run(['karma:phantomjs']);
     } else if (process.env.TRAVIS) {
       grunt.task.run(['karma:saucelabs']);
-      grunt.task.run(['connect:test', 'protractor']);
+      grunt.task.run(['connect:test', 'protractor:saucelabs']);
     } else {
       if (tasks.length === 0) {
         tasks.push('chrome');
       }
       if (tasks.length === 1) {
         tasks = tasks[0].split(',');
       }
-      tasks = tasks.map(function(el) {
-        return 'karma:' + el;
-      });
+      tasks = tasks.reduce(function(acc, el) {
+        acc.push('karma:' + el);
+        if (/chrome|firefox|safari|ie/.test(el)) {
+          acc.push('protractor:' + el);
+        }
+        return acc;
+      }, []);
+      tasks = ['update-webdriver', 'connect:test'].concat(tasks);
 
       grunt.task.run(tasks);
-      grunt.task.run(['update-webdriver', 'connect:test', 'protractor']);
     }
   });
 };

README.md

@@ -190,7 +190,7 @@ the web](http://www.html5rocks.com/en/tutorials/track/basics/).
 ### Testing
 
 For testing, you can either run `npm test` or use `grunt` directly.
-If you use `npm test`, it will only run the karma tests using chrome.
+If you use `npm test`, it will only run the karma and end-to-end tests using chrome.
 You can specify which browsers you want the tests to run via grunt's `test` task.
 You can use either grunt-style arguments or comma separated arguments:
 ```
@@ -201,10 +201,14 @@ Possible options are:
 * `chromecanary`
 * `phantomjs`
 * `opera`
-* `chrome`
-* `safari`
-* `firefox`
-* `ie`
+* `chrome`<sup>1</sup>
+* `safari`<sup>1, 2</sup>
+* `firefox`<sup>1</sup>
+* `ie`<sup>1</sup>
+
+
+_<sup>1</sup>supported end-to-end browsers_<br />
+_<sup>2</sup>requires the [SafariDriver extension]( https://code.google.com/p/selenium/wiki/SafariDriver) to be installed_
 
 ## Hosting Considerations
 Unlike a native HLS implementation, the HLS tech has to comply with