check jquery version inside directives, expose it on scope

Narretz · Narretz · commit 5b47bc47de78 · 2015-03-02T23:15:05.000+01:00
diff --git a/test/e2e/fixtures/ngJq/index.html b/test/e2e/fixtures/ngJq/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html ng-app="test" ng-jq>
 
+<jquery-version>{{jqueryVersion}}</jquery-version>
+
 <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
 <script src="angular.js"></script>
-<script>
-  angular.module('test', []);
-</script>
+<script type="text/javascript" src="script.js"></script>
 </html>
diff --git a/test/e2e/fixtures/ngJq/script.js b/test/e2e/fixtures/ngJq/script.js
@@ -0,0 +1,12 @@
+'use strict';
+
+angular.module('test', [])
+  .directive('jqueryVersion', function() {
+    return {
+      link: function(scope) {
+        if (window.angular.element !== window.jQuery) {
+          scope.jqueryVersion = 'jqLite';
+        }
+      }
+    };
+  });
diff --git a/test/e2e/fixtures/ngJqJquery/index.html b/test/e2e/fixtures/ngJqJquery/index.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
-<html ng-app="test" ng-jq="jQuery_2_0_0">
+<html ng-app="test" ng-jq="jQuery_2_1_0">
 
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
-<script>
-  var jQuery_2_0_0 = $.noConflict(true);
-</script>
-<script src="../../../../bower_components/jquery/dist/jquery.js"></script>
-<script src="angular.js"></script>
-<script>
-  angular.module('test', []);
-</script>
+    <jquery-version>{{jqueryVersion}}</jquery-version>
+
+    <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+    <script src="jquery2.1.0.min.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>
 </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,21 @@
+'use strict';
+
+angular.module('test', [])
+  .directive('jqueryVersion', function() {
+    return {
+      link: function(scope) {
+
+        // scope.jqueryVersion = angular.isDefined(window.jQuery_2_1_0);
+        // scope.jqueryVersion = angular.isDefined(window.jQuery_2_1_0().jquery);
+        // scope.jqueryVersion = window.jQuery_2_1_0().jquery;
+
+        scope.jqueryVersion = window.angular.element().jquery;
+        // scope.jqueryVersion = window.jQuery_2_1_0().jquery;
+        // scope.jqueryVersion = window.$().jquery;
+
+        if (window.angular.element === window.jQuery_2_1_0) {
+          // scope.jqueryVersion = 'jQuery_2_0_0';
+        }
+      }
+    };
+  });
diff --git a/test/e2e/tests/ngJqSpec.js b/test/e2e/tests/ngJqSpec.js
@@ -2,11 +2,11 @@ describe('Customizing the jqlite / jquery version', function() {
 
   it('should be able to force jqlite', function() {
     loadFixture("ngJq").andWaitForAngular();
-    expect(browser.executeScript('return window.angular.element !== window.jQuery')).toBe(true);
+    expect(element(by.binding('jqueryVersion')).getText()).toBe('jqLite');
   });
 
   it('should be able to use a specific version jQuery', function() {
     loadFixture("ngJqJquery").andWaitForAngular();
-    expect(browser.executeScript('return window.angular.element !== window.jQuery_2_0_0')).toBe(true);
+    expect(element(by.binding('jqueryVersion')).getText()).toBe('2.1.0');
   });
 });
