Skip to content

Commit

Permalink
chore(e2e): rename app-module.ts to app.module.ts for consistency
Browse files Browse the repository at this point in the history
references #10023
  • Loading branch information
brandyscarney committed Jan 13, 2017
1 parent eaa6248 commit d252fa4
Show file tree
Hide file tree
Showing 148 changed files with 7 additions and 62 deletions.
2 changes: 1 addition & 1 deletion scripts/e2e/e2e.template.dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<script>
System.import('@angular/platform-browser-dynamic').then(function(platformBrowserDynamic) {
System.import('app-module.js').then(function(appModule) {
System.import('app.module.js').then(function(appModule) {
platformBrowserDynamic.platformBrowserDynamic().bootstrapModule(appModule.AppModule);
}, console.error.bind(console));
}, console.error.bind(console));
Expand Down
2 changes: 1 addition & 1 deletion scripts/e2e/entry.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { platformBrowser } from '@angular/platform-browser';
import { AppModuleNgFactory } from './app-module.ngfactory';
import { AppModuleNgFactory } from './app.module.ngfactory';

platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
2 changes: 1 addition & 1 deletion scripts/gulp/tasks/e2e.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ task('e2e.build', function () {
.on('error', function (error) {
console.log(error.message);
})
.pipe(gulpif(/app-module.js$/, createIndexHTML()))
.pipe(gulpif(/app.module.js$/, createIndexHTML()))
.pipe(gulpif(/e2e.js$/, createPlatformTests()));

var testFiles = src([
Expand Down
8 changes: 4 additions & 4 deletions scripts/gulp/tasks/e2e.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ task('e2e.copySource', (done: Function) => {
const buildConfig = require('../../build/config');

const stream = src([`${SRC_ROOT}/**/*`, `!${SRC_ROOT}/**/*.spec.ts`])
.pipe(gulpif(/app-module.ts$/, createIndexHTML()))
.pipe(gulpif(/app.module.ts$/, createIndexHTML()))
.pipe(gulpif(/e2e.ts$/, createPlatformTests()))
.pipe(dest(DIST_E2E_ROOT));

Expand Down Expand Up @@ -101,10 +101,10 @@ task('e2e.compileTests', (done: Function) => {
});

function buildE2ETests(folderInfo: any, done: Function) {
let includeGlob = ['./components/*/test/*/app-module.ts', './components/*/test/*/entry.ts'];
let includeGlob = ['./components/*/test/*/app.module.ts', './components/*/test/*/entry.ts'];
if (folderInfo.componentName && folderInfo.componentTest) {
includeGlob = [
`./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app-module.ts`,
`./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app.module.ts`,
`./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/entry.ts`,
];
}
Expand Down Expand Up @@ -198,7 +198,7 @@ task('e2e.watchProd', ['e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts'],
let e2eTestPath = SRC_COMPONENTS_ROOT;

if (folderInfo.componentName && folderInfo.componentTest) {
e2eTestPath = join(SRC_COMPONENTS_ROOT, folderInfo.componentName, 'test', folderInfo.componentTest, 'app-module.ts');
e2eTestPath = join(SRC_COMPONENTS_ROOT, folderInfo.componentName, 'test', folderInfo.componentTest, 'app.module.ts');
}

try {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
55 changes: 0 additions & 55 deletions src/components/icon/test/basic/app-module.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit d252fa4

Please sign in to comment.