mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
@@ -28,7 +28,7 @@ System.config({
|
||||
baseURL: distPath
|
||||
});
|
||||
|
||||
System.import('system-config.js').then(function() {
|
||||
System.import(distPath + '@angular2-material/system-config.js').then(function() {
|
||||
// Load and configure the TestComponentBuilder.
|
||||
return Promise.all([
|
||||
System.import('@angular/core/testing'),
|
||||
|
||||
@@ -13,14 +13,13 @@ const config = {
|
||||
useAllAngular2AppRoots: true,
|
||||
specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
|
||||
baseUrl: E2E_BASE_URL,
|
||||
allScriptsTimeout: 30000,
|
||||
getPageTimeout: 30000,
|
||||
allScriptsTimeout: 120000,
|
||||
getPageTimeout: 120000,
|
||||
jasmineNodeOpts: {
|
||||
defaultTimeoutInterval: 60000,
|
||||
defaultTimeoutInterval: 120000,
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
if (process.env['TRAVIS']) {
|
||||
const key = require('../scripts/sauce/sauce_config');
|
||||
config.sauceUser = process.env['SAUCE_USERNAME'];
|
||||
|
||||
Reference in New Issue
Block a user