Skip to content

Commit 9155856

Browse files
committed
fix(ci): fix flakiness by inlining html & css
1 parent a3189e7 commit 9155856

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ var inlineNg2Template = require('gulp-inline-ng2-template');
1414

1515
gulp.task('inline-resources', function(){
1616
gulp.src('./dist/components/**/*.js')
17-
.pipe(inlineNg2Template({base: './dist'}))
17+
.pipe(inlineNg2Template({base: './dist', target: 'es5'}))
1818
.pipe(gulp.dest('./dist/components'));
1919
});

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"tslint": "tslint -c tslint.json 'src/**/*.ts'",
1616
"typings": "typings install --ambient",
1717
"postinstall": "npm run typings",
18-
"e2e": "protractor ./protractor.conf.js"
18+
"e2e": "protractor ./protractor.conf.js",
19+
"inline-resources": "gulp inline-resources"
1920
},
2021
"version": "2.0.0-alpha.1",
2122
"license": "MIT",

scripts/ci/build-and-test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ is_dart && source scripts/ci/sources/env_dart.sh
1515

1616
start_tunnel
1717
npm run build
18+
npm run inline-resources
1819
echo
1920
is_dart && pub install
2021

src/components/checkbox/checkbox.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,10 @@ export function main() {
195195
});
196196

197197
it('sets "aria-checked" to be "true" on the host element', function() {
198-
let el = fixture.debugElement.query(By.css('.md-checkbox'));
198+
let el = fixture.debugElement.query(By.css('md-checkbox'));
199+
controller.isIndeterminate = false;
200+
controller.isChecked = true;
201+
fixture.detectChanges();
199202
expect(el.nativeElement.getAttribute('aria-checked')).toEqual('true');
200203
});
201204

test/browser-providers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const configuration: { [name: string]: ConfigurationInfo } = {
2828
'Chrome': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
2929
'Firefox': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
3030
'ChromeBeta': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
31-
'FirefoxBeta': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
31+
'FirefoxBeta': { unitTest: {target: null, required: false}, e2e: {target: null, required: true}},
3232
'ChromeDev': { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
3333
'FirefoxDev': { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
3434
'IE9': { unitTest: {target: null, required: false}, e2e: {target: null, required: true}},

0 commit comments

Comments
 (0)