Commit f1f976e2 authored by Pascal Hartig's avatar Pascal Hartig

AngularJS: Upgrade to 1.2.12

parent 1b1d90e6
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"name": "todomvc-angular", "name": "todomvc-angular",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"angular": "1.2.10", "angular": "1.2.12",
"todomvc-common": "~0.1.4" "todomvc-common": "~0.1.4"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.2.10", "angular-mocks": "1.2.12",
"angular-route": "1.2.10" "angular-route": "1.2.12"
} }
} }
/** /**
* @license AngularJS v1.2.10 * @license AngularJS v1.2.12
* (c) 2010-2014 Google, Inc. http://angularjs.org * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
...@@ -350,17 +350,17 @@ function $RouteProvider(){ ...@@ -350,17 +350,17 @@ function $RouteProvider(){
} }
</file> </file>
<file name="scenario.js"> <file name="protractorTest.js">
it('should load and compile correct template', function() { it('should load and compile correct template', function() {
element('a:contains("Moby: Ch1")').click(); element(by.linkText('Moby: Ch1')).click();
var content = element('.doc-example-live [ng-view]').text(); var content = element(by.css('.doc-example-live [ng-view]')).getText();
expect(content).toMatch(/controller\: ChapterCntl/); expect(content).toMatch(/controller\: ChapterCntl/);
expect(content).toMatch(/Book Id\: Moby/); expect(content).toMatch(/Book Id\: Moby/);
expect(content).toMatch(/Chapter Id\: 1/); expect(content).toMatch(/Chapter Id\: 1/);
element('a:contains("Scarlet")').click(); element(by.partialLinkText('Scarlet')).click();
sleep(2); // promises are not part of scenario waiting
content = element('.doc-example-live [ng-view]').text(); content = element(by.css('.doc-example-live [ng-view]')).getText();
expect(content).toMatch(/controller\: BookCntl/); expect(content).toMatch(/controller\: BookCntl/);
expect(content).toMatch(/Book Id\: Scarlet/); expect(content).toMatch(/Book Id\: Scarlet/);
}); });
...@@ -794,16 +794,17 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory); ...@@ -794,16 +794,17 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
} }
</file> </file>
<file name="scenario.js"> <file name="protractorTest.js">
it('should load and compile correct template', function() { it('should load and compile correct template', function() {
element('a:contains("Moby: Ch1")').click(); element(by.linkText('Moby: Ch1')).click();
var content = element('.doc-example-live [ng-view]').text(); var content = element(by.css('.doc-example-live [ng-view]')).getText();
expect(content).toMatch(/controller\: ChapterCntl/); expect(content).toMatch(/controller\: ChapterCntl/);
expect(content).toMatch(/Book Id\: Moby/); expect(content).toMatch(/Book Id\: Moby/);
expect(content).toMatch(/Chapter Id\: 1/); expect(content).toMatch(/Chapter Id\: 1/);
element('a:contains("Scarlet")').click(); element(by.partialLinkText('Scarlet')).click();
content = element('.doc-example-live [ng-view]').text();
content = element(by.css('.doc-example-live [ng-view]')).getText();
expect(content).toMatch(/controller\: BookCntl/); expect(content).toMatch(/controller\: BookCntl/);
expect(content).toMatch(/Book Id\: Scarlet/); expect(content).toMatch(/Book Id\: Scarlet/);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment