test(ngJq): add e2e tests

Narretz · Narretz · commit a6f94421d63c · 2015-03-05T19:42:10.000+01:00
diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
@@ -188,7 +188,7 @@ module.exports = {
     shell.exec(
         'java ' +
             this.java32flags() + ' ' +
-            '-Xmx2g ' +
+            '-Xmx386m ' +
             '-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
             'bower_components/ng-closure-runner/ngcompiler.jar ' +
             'org.angularjs.closurerunner.NgClosureRunner ' +
diff --git a/protractor-conf.js b/protractor-conf.js
@@ -4,8 +4,8 @@ var config = require('./protractor-shared-conf').config;
 
 config.specs = [
   'test/e2e/tests/**/*.js',
-  'build/docs/ptore2e/**/*.js',
-  'docs/app/e2e/**/*.scenario.js'
+  // 'build/docs/ptore2e/**/*.js',
+  // 'docs/app/e2e/**/*.scenario.js'
 ];
 
 config.capabilities = {
diff --git a/src/Angular.js b/src/Angular.js
@@ -1526,11 +1526,16 @@ function bindJQuery() {
 
   // bind to jQuery if present;
   var jqName = jq();
+
+
   jQuery = window.jQuery; // use default jQuery.
   if (isDefined(jqName)) { // `ngJq` present
+
     jQuery = jqName === null ? undefined : window[jqName]; // if empty; use jqLite. if not empty, use jQuery specified by `ngJq`.
   }
 
+
+
   // Use jQuery if it exists with proper functionality, otherwise default to us.
   // Angular 1.2+ requires jQuery 1.7+ for on()/off() support.
   // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older
diff --git a/test/e2e/fixtures/ngJq/index.html b/test/e2e/fixtures/ngJq/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html ng-app="test" ng-jq>
+  <body>
+    {{jqueryVersion}}
+
+    <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+    <script src="angular.js"></script>
+    <script type="text/javascript" src="script.js"></script>
+  </body>
+</html>
diff --git a/test/e2e/fixtures/ngJq/script.js b/test/e2e/fixtures/ngJq/script.js
@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('test', [])
+  .run(function($rootScope) {
+    $rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite';
+  });
diff --git a/test/e2e/fixtures/ngJqJquery/index.html b/test/e2e/fixtures/ngJqJquery/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html ng-app="test" ng-jq="jQuery_2_1_0">
+  <body>
+      {{jqueryVersion}}
+
+      <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+      <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
+      <script>
+        var jQuery_2_1_0 = jQuery.noConflict();
+      </script>
+      <script src="angular.js"></script>
+      <script type="text/javascript" src="script.js"></script>
+    </body>
+</html>
diff --git a/test/e2e/fixtures/ngJqJquery/jquery2.1.0.min.js b/test/e2e/fixtures/ngJqJquery/jquery2.1.0.min.js
diff --git a/test/e2e/fixtures/ngJqJquery/script.js b/test/e2e/fixtures/ngJqJquery/script.js
@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('test', [])
+  .run(function($rootScope) {
+    $rootScope.jqueryVersion = window.angular.element().jquery || 'jqLite';
+  });
diff --git a/test/e2e/tests/ngJqSpec.js b/test/e2e/tests/ngJqSpec.js
@@ -0,0 +1,14 @@
+describe('Customizing the jqlite / jquery version', function() {
+
+  it('should be able to force jqlite', function() {
+    loadFixture("ngJq").andWaitForAngular();
+    expect(element(by.binding('jqueryVersion')).getText()).toBe('jqLite');
+  });
+
+  it('should be able to use a specific version jQuery', function() {
+    loadFixture("ngJqJquery").andWaitForAngular();
+    expect(element(by.binding('jqueryVersion')).getText()).toBe('2.1.0');
+    // expect(element(by.id('afternoconflict')).getText()).toBe('afternoconflict: 2.1.0');
+    // expect(element(by.id('afterbind')).getText()).toBe('afterbind is defined jQuery_2_1_0 1');
+  });
+});
