Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
todomvc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eugene Shen
todomvc
Commits
f1f976e2
Commit
f1f976e2
authored
Feb 14, 2014
by
Pascal Hartig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AngularJS: Upgrade to 1.2.12
parent
1b1d90e6
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
756 additions
and
551 deletions
+756
-551
architecture-examples/angularjs/bower.json
architecture-examples/angularjs/bower.json
+3
-3
architecture-examples/angularjs/bower_components/angular-route/angular-route.js
...angularjs/bower_components/angular-route/angular-route.js
+13
-12
architecture-examples/angularjs/bower_components/angular/angular.js
...re-examples/angularjs/bower_components/angular/angular.js
+740
-536
No files found.
architecture-examples/angularjs/bower.json
View file @
f1f976e2
...
...
@@ -2,11 +2,11 @@
"name"
:
"todomvc-angular"
,
"version"
:
"0.0.0"
,
"dependencies"
:
{
"angular"
:
"1.2.1
0
"
,
"angular"
:
"1.2.1
2
"
,
"todomvc-common"
:
"~0.1.4"
},
"devDependencies"
:
{
"angular-mocks"
:
"1.2.1
0
"
,
"angular-route"
:
"1.2.1
0
"
"angular-mocks"
:
"1.2.1
2
"
,
"angular-route"
:
"1.2.1
2
"
}
}
architecture-examples/angularjs/bower_components/angular-route/angular-route.js
View file @
f1f976e2
/**
* @license AngularJS v1.2.1
0
* @license AngularJS v1.2.1
2
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
...
...
@@ -350,17 +350,17 @@ function $RouteProvider(){
}
</file>
<file name="
scenario
.js">
<file name="
protractorTest
.js">
it('should load and compile correct template', function() {
element(
'a:contains("Moby: Ch1")'
).click();
var content = element(
'.doc-example-live [ng-view]').t
ext();
element(
by.linkText('Moby: Ch1')
).click();
var content = element(
by.css('.doc-example-live [ng-view]')).getT
ext();
expect(content).toMatch(/controller\: ChapterCntl/);
expect(content).toMatch(/Book Id\: Moby/);
expect(content).toMatch(/Chapter Id\: 1/);
element(
'a:contains("Scarlet")'
).click();
sleep(2); // promises are not part of scenario waiting
content = element(
'.doc-example-live [ng-view]').t
ext();
element(
by.partialLinkText('Scarlet')
).click();
content = element(
by.css('.doc-example-live [ng-view]')).getT
ext();
expect(content).toMatch(/controller\: BookCntl/);
expect(content).toMatch(/Book Id\: Scarlet/);
});
...
...
@@ -794,16 +794,17 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
}
</file>
<file name="
scenario
.js">
<file name="
protractorTest
.js">
it('should load and compile correct template', function() {
element(
'a:contains("Moby: Ch1")'
).click();
var content = element(
'.doc-example-live [ng-view]').t
ext();
element(
by.linkText('Moby: Ch1')
).click();
var content = element(
by.css('.doc-example-live [ng-view]')).getT
ext();
expect(content).toMatch(/controller\: ChapterCntl/);
expect(content).toMatch(/Book Id\: Moby/);
expect(content).toMatch(/Chapter Id\: 1/);
element('a:contains("Scarlet")').click();
content = element('.doc-example-live [ng-view]').text();
element(by.partialLinkText('Scarlet')).click();
content = element(by.css('.doc-example-live [ng-view]')).getText();
expect(content).toMatch(/controller\: BookCntl/);
expect(content).toMatch(/Book Id\: Scarlet/);
});
...
...
architecture-examples/angularjs/bower_components/angular/angular.js
View file @
f1f976e2
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment