Merge of selected changes from Sharathkumar92 into pfilippi's submission.

Author: sah2ed

protractor.conf.js

@@ -1,19 +1,19 @@
 'use strict';
 
+var paths = require('./.yo-rc.json')['generator-gulp-angular'].props.paths;
+
 // An example configuration file.
 exports.config = {
-  // The address of a running selenium server.
-  //seleniumAddress: 'http://localhost:4444/wd/hub',
-  //seleniumServerJar: deprecated, this should be set on node_modules/protractor/config.json
 
   // Capabilities to be passed to the webdriver instance.
+
   capabilities: {
     'browserName': 'chrome'
   },
 
   // Spec patterns are relative to the current working directly when
   // protractor is called.
-  specs: ['e2e/**/*.js'],
+  specs: [paths.e2e + '/**/*.js'],
 
   // Options to be passed to Jasmine-node.
   jasmineNodeOpts: {