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

Commit 7f5f4b9

Browse files
committed
docs(testing): fix base setting in karma shims
1 parent 48cd008 commit 7f5f4b9

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

public/docs/_examples/quickstart/ts/app/app.module.1.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1+
// #docplaster
12
// #docregion
3+
// #docregion v1
24
import { NgModule } from '@angular/core';
35
import { BrowserModule } from '@angular/platform-browser';
6+
// #enddocregion v1
47

5-
import { AppComponent } from './app.component';
8+
import { AppComponent } from './app.component';
69

10+
// #docregion v1
711
@NgModule({
812
imports: [ BrowserModule ],
13+
// #enddocregion v1
914
declarations: [ AppComponent ],
1015
bootstrap: [ AppComponent ]
16+
// #docregion v1
1117
})
1218

1319
export class AppModule { }
20+
// #enddocregion v1

public/docs/_examples/testing/ts/karma-test-shim.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var allSpecFiles = Object.keys(window.__karma__.files)
2828
.filter(isBuiltFile);
2929

3030
System.config({
31-
baseURL: '/base',
31+
baseURL: 'base',
3232
// Extend usual application package list with test folder
3333
packages: { 'testing': { main: 'index.js', defaultExtension: 'js' } },
3434

public/docs/_examples/testing/ts/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = function(config) {
33

44
var appBase = 'app/'; // transpiled app JS and map files
55
var appSrcBase = 'app/'; // app source TS files
6-
var appAssets = '/base/app/'; // component assets fetched by Angular's compiler
6+
var appAssets = 'base/app/'; // component assets fetched by Angular's compiler
77

88
var testBase = 'testing/'; // transpiled test JS and map files
99
var testSrcBase = 'testing/'; // test source TS files

public/docs/ts/latest/quickstart.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ block install-packages
173173
:marked
174174
Create the file `app/app.module.ts` with the following content:
175175

176-
+makeExample('app/app.module.1.ts')(format='.')
176+
+makeExample('app/app.module.ts', 'v1')(format='.')
177177

178178
:marked
179179
This is the entry point to your application.

0 commit comments

Comments
 (0)