Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 56e5643

Browse files
committed
chore: rename files in ngUpgrade
1 parent de4903b commit 56e5643

38 files changed

+59
-244
lines changed

public/docs/_examples/upgrade-module/e2e-spec.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('Upgrade Tests', function () {
99
setProtractorToHybridMode();
1010
});
1111

12-
describe('NG1 Auto-bootstrap', function() {
12+
describe('AngularJS Auto-bootstrap', function() {
1313

1414
beforeAll(function () {
1515
browser.get('/index-ng-app.html');
@@ -21,7 +21,7 @@ describe('Upgrade Tests', function () {
2121

2222
});
2323

24-
describe('NG1 JavaScript Bootstrap', function() {
24+
describe('AngularJS JavaScript Bootstrap', function() {
2525

2626
beforeAll(function () {
2727
browser.get('/index-bootstrap.html');
@@ -33,10 +33,10 @@ describe('Upgrade Tests', function () {
3333

3434
});
3535

36-
describe('NG1-2 Hybrid Bootstrap', function() {
36+
describe('AngularJS-Angular Hybrid Bootstrap', function() {
3737

3838
beforeAll(function () {
39-
browser.get('/index-1-2-hybrid-bootstrap.html');
39+
browser.get('/index-ajs-a-hybrid-bootstrap.html');
4040
});
4141

4242
it('bootstraps as expected', function () {
@@ -113,7 +113,7 @@ describe('Upgrade Tests', function () {
113113
describe('Downgraded component with content projection', function() {
114114

115115
beforeAll(function () {
116-
browser.get('/index-1-to-2-projection.html');
116+
browser.get('/index-ajs-to-a-projection.html');
117117
});
118118

119119
it('can be transcluded into', function () {
@@ -126,7 +126,7 @@ describe('Upgrade Tests', function () {
126126
describe('Upgraded component with transclusion', function() {
127127

128128
beforeAll(function () {
129-
browser.get('/index-2-to-1-transclusion.html');
129+
browser.get('/index-a-to-ajs-transclusion.html');
130130
});
131131

132132
it('can be projected into', function () {
@@ -136,10 +136,10 @@ describe('Upgrade Tests', function () {
136136
});
137137

138138

139-
describe('Upgrading NG1 Providers', function() {
139+
describe('Upgrading AngularJS Providers', function() {
140140

141141
beforeAll(function () {
142-
browser.get('/index-1-to-2-providers.html');
142+
browser.get('/index-ajs-to-a-providers.html');
143143
});
144144

145145
it('works', function () {
@@ -149,10 +149,10 @@ describe('Upgrade Tests', function () {
149149
});
150150

151151

152-
describe('Downgrading NG2 Providers', function() {
152+
describe('Downgrading Angular Providers', function() {
153153

154154
beforeAll(function () {
155-
browser.get('/index-2-to-1-providers.html');
155+
browser.get('/index-a-to-ajs-providers.html');
156156
});
157157

158158
it('works', function () {

public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html renamed to public/docs/_examples/upgrade-module/ts/index-a-to-ajs-providers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<script src="systemjs.config.js"></script>
1818
<script>
19-
System.import('app/1-to-2-providers/app.module')
19+
System.import('app/a-to-ajs-providers/app.module')
2020
.then(null, console.error.bind(console));
2121
</script>
2222
</head>

public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html renamed to public/docs/_examples/upgrade-module/ts/index-a-to-ajs-transclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<script src="systemjs.config.js"></script>
1818
<script>
19-
System.import('app/2-to-1-transclusion/app.module')
19+
System.import('app/a-to-ajs-transclusion/app.module')
2020
.then(null, console.error.bind(console));
2121
</script>
2222
</head>

public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html renamed to public/docs/_examples/upgrade-module/ts/index-ajs-a-hybrid-bootstrap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<script src="systemjs.config.js"></script>
1818
<script>
19-
System.import('app/1-2-hybrid-bootstrap/app.module')
19+
System.import('app/ajs-a-hybrid-bootstrap/app.module')
2020
.then(null, console.error.bind(console));
2121
</script>
2222
</head>

public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html renamed to public/docs/_examples/upgrade-module/ts/index-ajs-to-a-projection.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<script src="systemjs.config.js"></script>
1818
<script>
19-
System.import('app/1-to-2-projection/app.module')
19+
System.import('app/ajs-to-a-projection/app.module')
2020
.then(null, console.error.bind(console));
2121
</script>
2222
</head>

public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html renamed to public/docs/_examples/upgrade-module/ts/index-ajs-to-a-providers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<script src="systemjs.config.js"></script>
1818
<script>
19-
System.import('app/2-to-1-providers/app.module')
19+
System.import('app/ajs-to-a-providers/app.module')
2020
.then(null, console.error.bind(console));
2121
</script>
2222
</head>

public/docs/_examples/upgrade-module/ts/index-bootstrap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
6-
<script src="app/1-bootstrap/app.module.js"></script>
6+
<script src="app/ajs-bootstrap/app.module.js"></script>
77
</head>
88

99
<body>

public/docs/_examples/upgrade-module/ts/index-ng-app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
6-
<script src="app/1-ng-app/app.module.js"></script>
6+
<script src="app/ajs-ng-app/app.module.js"></script>
77
</head>
88

99
<body ng-app="heroApp" ng-strict-di>

public/docs/_examples/upgrade-phonecat-1-typescript/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ structure.
33

44
The following changes from vanilla Phonecat are applied:
55

6-
* The TypeScript config file shown in the guide is `tsconfig.ng1.json` instead
6+
* The TypeScript config file shown in the guide is `tsconfig.ajs.json` instead
77
of the default, because we don't want to enable `noImplicitAny` for migration.
8-
* Karma config for unit tests is in karma.conf.ng1.js because the boilerplate
8+
* Karma config for unit tests is in karma.conf.ajs.js because the boilerplate
99
Karma config is not compatible with the way AngularJS tests need to be run.
1010
The shell script run-unit-tests.sh can be used to run the unit tests.
1111
* Instead of using Bower, AngularJS and its dependencies are fetched from a CDN
12-
in index.html and karma.conf.ng1.js.
12+
in index.html and karma.conf.ajs.js.
1313
* E2E tests have been moved to the parent directory, where `gulp run-e2e-tests` can
1414
discover and run them along with all the other examples.
1515
* Most of the phone JSON and image data removed in the interest of keeping

public/docs/_examples/upgrade-phonecat-1-typescript/ts/karma.conf.ng1.js

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## The boilerplate Karma configuration won't work with AngularJS tests since
22
## a specific loading configuration is needed for them.
3-
## We keep one in karma.conf.ng1.js. This scripts runs the ng1 tests with
3+
## We keep one in karma.conf.ajs.js. This scripts runs the AngularJS tests with
44
## that config.
55

66
PATH=$(npm bin):$PATH
7-
tsc && karma start karma.conf.ng1.js
7+
tsc && karma start karma.conf.ajs.js

public/docs/_examples/upgrade-phonecat-2-hybrid/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ structure.
33

44
The following changes from vanilla Phonecat are applied:
55

6-
* Karma config for unit tests is in karma.conf.ng1.js because the boilerplate
6+
* Karma config for unit tests is in karma.conf.ajs.js because the boilerplate
77
Karma config is not compatible with the way AngularJS tests need to be run.
88
The shell script run-unit-tests.sh can be used to run the unit tests.
9-
* There's a `package.ng1.json`, which is not used to run anything but only to
9+
* There's a `package.ajs.json`, which is not used to run anything but only to
1010
show an example of changing the PhoneCat http-server root path.
1111
* Also for the Karma shim, there is a `karma-test-shim.1.js` file which isn't
1212
used but is shown in the test appendix.
1313
* Instead of using Bower, AngularJS and its dependencies are fetched from a CDN
14-
in index.html and karma.conf.ng1.js.
14+
in index.html and karma.conf.ajs.js.
1515
* E2E tests have been moved to the parent directory, where `run-e2e-tests` can
1616
discover and run them along with all the other examples.
1717
* Most of the phone JSON and image data removed in the interest of keeping

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@
1717
<script src="https://code.angularjs.org/1.5.5/angular-resource.js"></script>
1818
<script src="https://code.angularjs.org/1.5.5/angular-route.js"></script>
1919

20-
<script src="app.module.ng1.js"></script>
20+
<script src="app.module.ajs.js"></script>
2121
<script src="app.config.js"></script>
2222
<script src="app.animations.js"></script>
2323
<script src="core/core.module.js"></script>
2424
<script src="core/phone/phone.module.js"></script>
2525
<script src="phone-list/phone-list.module.js"></script>
2626
<script src="phone-detail/phone-detail.module.js"></script>
2727

28-
<!-- #docregion ng2 -->
28+
<!-- #docregion angular -->
2929
<script src="/node_modules/core-js/client/shim.min.js"></script>
3030
<script src="/node_modules/zone.js/dist/zone.js"></script>
3131
<script src="/node_modules/systemjs/dist/system.src.js"></script>
32-
<!-- #enddocregion ng2 -->
32+
<!-- #enddocregion angular -->
3333
<script src="/systemjs.config.1.js"></script>
34-
<!-- #docregion ng2
34+
<!-- #docregion angular
3535
<script src="/systemjs.config.js"></script>
3636
<script>
3737
System.import('/app');
3838
</script>
39-
<!-- #enddocregion ng2 -->
39+
<!-- #enddocregion angular -->
4040
<script>
4141
System.import('/app');
4242
</script>

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/karma.conf.ng1.js

Lines changed: 0 additions & 73 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## The boilerplate Karma configuration won't work with AngularJS tests since
22
## a specific loading configuration is needed for them.
3-
## We keep one in karma.conf.ng1.js. This scripts runs the ng1 tests with
3+
## We keep one in karma.conf.ajs.js. This scripts runs the AngularJS tests with
44
## that config.
55

66
PATH=$(npm bin):$PATH
7-
tsc && karma start karma.conf.ng1.js
7+
tsc && karma start karma.conf.ajs.js

0 commit comments

Comments
 (0)