honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(testing): karma config files support multiple builtPaths (#2917)

Browse Source 
* karma.config + karma-test-shim can handle multiple spec source paths;
  see quickstart issue: https://github.com/angular/quickstart/issues/294
* cosmetic `karma.config.js` changes
This commit is contained in:
Ward Bell 2016-11-30 15:26:27 -08:00 committed by GitHub
parent d9c1054ae6
commit 1be698ca7f
3 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,10 @@ Error.stackTraceLimit = 0; // "No stacktrace"" is usually best for app testing.
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
var builtPath = '/base/app/'; // builtPaths: root paths for output ("built") files
// get from karma.config.js, then prefix with '/base/' (default is 'app/')
var builtPaths = (__karma__.config.builtPaths || ['app/'])
.map(function(p) { return '/base/'+p;});
__karma__.loaded = function () { }; __karma__.loaded = function () { };
@ -19,8 +22,12 @@ function isSpecFile(path) {
return /\.spec\.(.*\.)?js$/.test(path); return /\.spec\.(.*\.)?js$/.test(path);
} }
// Is a "built" file if is JavaScript file in one of the "built" folders
function isBuiltFile(path) { function isBuiltFile(path) {
return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath); return isJsFile(path) &&
builtPaths.reduce(function(keep, bp) {
return keep || (path.substr(0, bp.length) === bp);
}, false);
} }
var allSpecFiles = Object.keys(window.__karma__.files) var allSpecFiles = Object.keys(window.__karma__.files)

53
public/docs/_examples/testing/ts/karma.conf.js
View File

@ -5,19 +5,24 @@ module.exports = function(config) {
var appSrcBase = 'app/'; // app source TS files var appSrcBase = 'app/'; // app source TS files
var appAssets = 'base/app/'; // component assets fetched by Angular's compiler var appAssets = 'base/app/'; // component assets fetched by Angular's compiler
var testBase = 'testing/'; // transpiled test JS and map files var testingBase = 'testing/'; // transpiled test JS and map files
var testSrcBase = 'testing/'; // test source TS files var testingSrcBase = 'testing/'; // test source TS files
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine'], frameworks: ['jasmine'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), // click "Debug" in browser to see it require('karma-jasmine-html-reporter')
require('karma-htmlfile-reporter') // crashing w/ strange socket error
], ],
client: {
builtPaths: [appSrcBase, testingBase], // add more spec base paths as needed
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
customLaunchers: { customLaunchers: {
// From the CLI. Not used here but interesting // From the CLI. Not used here but interesting
// chrome setup for travis CI using chromium // chrome setup for travis CI using chromium
@ -26,6 +31,7 @@ module.exports = function(config) {
flags: ['--no-sandbox'] flags: ['--no-sandbox']
} }
}, },
files: [ files: [
// System.js for module loading // System.js for module loading
'node_modules/systemjs/dist/system.src.js', 'node_modules/systemjs/dist/system.src.js',
@ -49,28 +55,28 @@ module.exports = function(config) {
// Paths loaded via module imports: // Paths loaded via module imports:
// Angular itself // Angular itself
{pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, { pattern: 'node_modules/@angular/**/*.js', included: false, watched: false },
{pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false}, { pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false },
{pattern: 'systemjs.config.js', included: false, watched: false}, { pattern: 'systemjs.config.js', included: false, watched: false },
{pattern: 'systemjs.config.extras.js', included: false, watched: false}, { pattern: 'systemjs.config.extras.js', included: false, watched: false },
'karma-test-shim.js', 'karma-test-shim.js', // optionally extend SystemJS mapping e.g., with barrels
// transpiled application & spec code paths loaded via module imports // transpiled application & spec code paths loaded via module imports
{pattern: appBase + '**/*.js', included: false, watched: true}, { pattern: appBase + '**/*.js', included: false, watched: true },
{pattern: testBase + '**/*.js', included: false, watched: true}, { pattern: testingBase + '**/*.js', included: false, watched: true },
// Asset (HTML & CSS) paths loaded via Angular's component compiler // Asset (HTML & CSS) paths loaded via Angular's component compiler
// (these paths need to be rewritten, see proxies section) // (these paths need to be rewritten, see proxies section)
{pattern: appBase + '**/*.html', included: false, watched: true}, { pattern: appBase + '**/*.html', included: false, watched: true },
{pattern: appBase + '**/*.css', included: false, watched: true}, { pattern: appBase + '**/*.css', included: false, watched: true },
// Paths for debugging with source maps in dev tools // Paths for debugging with source maps in dev tools
{pattern: appSrcBase + '**/*.ts', included: false, watched: false}, { pattern: appSrcBase + '**/*.ts', included: false, watched: false },
{pattern: appBase + '**/*.js.map', included: false, watched: false}, { pattern: appBase + '**/*.js.map', included: false, watched: false },
{pattern: testSrcBase + '**/*.ts', included: false, watched: false}, { pattern: testingSrcBase + '**/*.ts', included: false, watched: false },
{pattern: testBase + '**/*.js.map', included: false, watched: false} { pattern: testingBase + '**/*.js.map', included: false, watched: false}
], ],
// Proxied base paths for loading assets // Proxied base paths for loading assets
@ -81,18 +87,7 @@ module.exports = function(config) {
exclude: [], exclude: [],
preprocessors: {}, preprocessors: {},
// disabled HtmlReporter; suddenly crashing w/ strange socket error reporters: ['progress', 'kjhtml'],
reporters: ['progress', 'kjhtml'],//'html'],
// HtmlReporter configuration
htmlReporter: {
// Open this file to see results in browser
outputFile: '_test-output/tests.html',
// Optional
pageTitle: 'Unit Tests',
subPageTitle: __dirname
},
port: 9876, port: 9876,
colors: true, colors: true,

5
public/docs/ts/latest/guide/change-log.jade
View File

@ -5,6 +5,11 @@ block includes
The Angular documentation is a living document with continuous improvements. The Angular documentation is a living document with continuous improvements.
This log calls attention to recent significant changes. This log calls attention to recent significant changes.
## Testing: karma file updates (2016-11-30)
* karma.config + karma-test-shim can handle multiple spec source paths;
see quickstart issue: [angular/quickstart#294](https://github.com/angular/quickstart/issues/294)
* Displays Jasmine Runner output in the karma-launched browser
## QuickStart Rewrite (2016-11-18) ## QuickStart Rewrite (2016-11-18)
The QuickStart is completely rewritten so that it actually is quick. The QuickStart is completely rewritten so that it actually is quick.
It references a minimal "Hello Angular" app running in Plunker. It references a minimal "Hello Angular" app running in Plunker.