test(ngJq): add expectations, add test for specific version of jq

Narretz · Narretz · commit 218e01164f44 · 2015-03-01T23:23:54.000+01:00
diff --git a/test/e2e/fixtures/ngJq/index.html b/test/e2e/fixtures/ngJq/index.html
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <html ng-app="test" ng-jq>
 
-<div ng-controller="TestCtrl">
-    <p>{{text}}</p>
-</div>
-
 <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
 <script src="angular.js"></script>
-<script src="script.js"></script>
+<script>
+  angular.module('test', []);
+</script>
 </html>
diff --git a/test/e2e/fixtures/ngJq/script.js b/test/e2e/fixtures/ngJq/script.js
diff --git a/test/e2e/fixtures/ngJqJquery/index.html b/test/e2e/fixtures/ngJqJquery/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html ng-app="test" ng-jq="jQuery_2_0_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>
+</html>
diff --git a/test/e2e/tests/ngJqSpec.js b/test/e2e/tests/ngJqSpec.js
@@ -1,14 +1,12 @@
-// Sample E2E test:
-//
-describe('Force jqlite', function() {
-  beforeEach(function() {
+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);
   });
 
-  it('should use jqlite', function() {
-    expect(element(by.binding('text')).getText())
-        .toBe('Hello, world!');
-
-    // expect(browser.executeScript('return window.angular.jq();')).toBe('');
+  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);
   });
 });
