From 30484cd41bf04571584504f3bc16c5c9e7f149e9 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Mon, 16 Nov 2015 16:26:49 -0800
Subject: [PATCH] Use require.resolve when possible to avoid hard coded module
 paths.

---
 docs/app/e2e/app.scenario.js | 4 ++--
 karma-shared.conf.js         | 4 ++--
 lib/grunt/plugins.js         | 2 +-
 lib/grunt/utils.js           | 6 +++---
 package.json                 | 2 ++
 src/ng/directive/ngCsp.js    | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/app/e2e/app.scenario.js b/docs/app/e2e/app.scenario.js
index f25d5d8233a5..17cc7f3a2aee 100644
--- a/docs/app/e2e/app.scenario.js
+++ b/docs/app/e2e/app.scenario.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var webdriver = require('protractor/node_modules/selenium-webdriver');
+var webdriver = require('selenium-webdriver');
 
 describe('docs.angularjs.org', function () {
 
@@ -83,4 +83,4 @@ describe('docs.angularjs.org', function () {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index 5f37d144e4d7..fb62e4508dab 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -164,8 +164,8 @@ module.exports = function(config, specificOptions) {
     '/someSanitizedUrl',
     '/{{testUrl}}'
   ];
-  var log4js = require('./node_modules/karma/node_modules/log4js');
-  var layouts = require('./node_modules/karma/node_modules/log4js/lib/layouts');
+  var log4js = require('log4js');
+  var layouts = require('log4js/lib/layouts');
   var originalConfigure = log4js.configure;
   log4js.configure = function(log4jsConfig) {
     var consoleAppender = log4jsConfig.appenders.shift();
diff --git a/lib/grunt/plugins.js b/lib/grunt/plugins.js
index cbf32cf360c7..33f9b1ce3c16 100644
--- a/lib/grunt/plugins.js
+++ b/lib/grunt/plugins.js
@@ -37,7 +37,7 @@ module.exports = function(grunt) {
 
 
   grunt.registerTask('docs', 'create angular docs', function(){
-    var gruntProc = shelljs.exec('"node_modules/.bin/gulp" --gulpfile docs/gulpfile.js');
+    var gruntProc = shelljs.exec('"' + require.resolve('gulp/bin/gulp') + '" --gulpfile docs/gulpfile.js');
     if (gruntProc.code !== 0) {
       throw new Error('doc generation failed');
     }
diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 204db413ecf2..4f7ba9c24a0c 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -19,7 +19,7 @@ module.exports = {
     var reporters = grunt.option('reporters');
     var noColor = grunt.option('no-colors');
     var port = grunt.option('port');
-    var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,
+    var p = spawn('node', [require.resolve('karma/bin/karma'), 'start', config,
       singleRun ? '--single-run=true' : '',
       reporters ? '--reporters=' + reporters : '',
       browsers ? '--browsers=' + browsers : '',
@@ -42,7 +42,7 @@ module.exports = {
       done();
       return;
     }
-    var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']);
+    var p = spawn('node', [require.resolve('protractor/bin/webdriver-manager'), 'update']);
     p.stdout.pipe(process.stdout);
     p.stderr.pipe(process.stderr);
     p.on('exit', function(code){
@@ -58,7 +58,7 @@ module.exports = {
     var sauceBuild = grunt.option('capabilities.build');
     var browser = grunt.option('browser');
     var specs = grunt.option('specs');
-    var args = ['node_modules/protractor/bin/protractor', config];
+    var args = [require.resolve('protractor/bin/protractor'), config];
     if (sauceUser) args.push('--sauceUser=' + sauceUser);
     if (sauceKey) args.push('--sauceKey=' + sauceKey);
     if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);
diff --git a/package.json b/package.json
index c45da47a68de..6837b714ba3a 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "karma-script-launcher": "0.1.0",
     "load-grunt-tasks": "~0.6.0",
     "lodash": "~2.4.1",
+    "log4js": "^0.6.27",
     "marked": "~0.3.0",
     "node-html-encoder": "0.0.2",
     "promises-aplus-tests": "~2.1.0",
@@ -72,6 +73,7 @@
     "q-io": "^1.10.9",
     "qq": "^0.3.5",
     "rewire": "~2.1.0",
+    "selenium-webdriver": "^2.48.2",
     "semver": "~4.0.3",
     "shelljs": "~0.3.0",
     "sorted-object": "^1.0.0",
diff --git a/src/ng/directive/ngCsp.js b/src/ng/directive/ngCsp.js
index 378333b4a854..3d9339c3f372 100644
--- a/src/ng/directive/ngCsp.js
+++ b/src/ng/directive/ngCsp.js
@@ -162,7 +162,7 @@
 
           beforeEach(function() {
             util = require('util');
-            webdriver = require('protractor/node_modules/selenium-webdriver');
+            webdriver = require('selenium-webdriver');
           });
 
           // For now, we only test on Chrome,