diff --git a/gulpfile.js b/gulpfile.js index 9342f7d7b15..b39248e634d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -14,6 +14,6 @@ var inlineNg2Template = require('gulp-inline-ng2-template'); gulp.task('inline-resources', function(){ gulp.src('./dist/components/**/*.js') - .pipe(inlineNg2Template({base: './dist'})) + .pipe(inlineNg2Template({base: './dist', target: 'es5'})) .pipe(gulp.dest('./dist/components')); }); diff --git a/package.json b/package.json index 20bee85278b..d3583e39952 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "tslint": "tslint -c tslint.json 'src/**/*.ts'", "typings": "typings install --ambient", "postinstall": "npm run typings", - "e2e": "protractor ./protractor.conf.js" + "e2e": "protractor ./protractor.conf.js", + "inline-resources": "gulp inline-resources" }, "version": "2.0.0-alpha.1", "license": "MIT", diff --git a/scripts/ci/build-and-test.sh b/scripts/ci/build-and-test.sh index 1fe53778e34..6be170ef521 100755 --- a/scripts/ci/build-and-test.sh +++ b/scripts/ci/build-and-test.sh @@ -15,6 +15,7 @@ is_dart && source scripts/ci/sources/env_dart.sh start_tunnel npm run build +npm run inline-resources echo is_dart && pub install diff --git a/src/components/checkbox/checkbox.spec.ts b/src/components/checkbox/checkbox.spec.ts index f25d382c032..cc5a4936790 100644 --- a/src/components/checkbox/checkbox.spec.ts +++ b/src/components/checkbox/checkbox.spec.ts @@ -195,7 +195,10 @@ export function main() { }); it('sets "aria-checked" to be "true" on the host element', function() { - let el = fixture.debugElement.query(By.css('.md-checkbox')); + let el = fixture.debugElement.query(By.css('md-checkbox')); + controller.isIndeterminate = false; + controller.isChecked = true; + fixture.detectChanges(); expect(el.nativeElement.getAttribute('aria-checked')).toEqual('true'); }); diff --git a/test/browser-providers.ts b/test/browser-providers.ts index 90d23095f30..d2d8ec8d3ad 100644 --- a/test/browser-providers.ts +++ b/test/browser-providers.ts @@ -28,7 +28,7 @@ const configuration: { [name: string]: ConfigurationInfo } = { 'Chrome': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Firefox': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'ChromeBeta': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, - 'FirefoxBeta': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, + 'FirefoxBeta': { unitTest: {target: null, required: false}, e2e: {target: null, required: true}}, 'ChromeDev': { unitTest: {target: null, required: true}, e2e: {target: null, required: true}}, 'FirefoxDev': { unitTest: {target: null, required: true}, e2e: {target: null, required: true}}, 'IE9': { unitTest: {target: null, required: false}, e2e: {target: null, required: true}},