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

chore(material): add simple e2e smoke tests for components.

This commit is contained in:
Jeremy Elbourn 2015-05-04 18:34:06 -07:00
parent 93c331d103
commit 20a033e4c9
22 changed files with 137 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gulpfile.js
View File

@ -746,11 +746,22 @@ gulp.task('build', ['build.js', 'build.dart']);
// ------------
// angular material testing rules
gulp.task('build.js.material', ['build.js.dev'], function() {
gulp.task('build.css.material', function() {
return gulp.src('modules/*/src/**/*.scss')
.pipe(sass())
.pipe(autoprefixer())
.pipe(gulp.dest(CONFIG.dest.js.dev.es5));
.pipe(gulp.dest(CONFIG.dest.js.prod.es5))
.pipe(gulp.dest(CONFIG.dest.js.dev.es5))
.pipe(gulp.dest(CONFIG.dest.js.dart2js + '/examples/packages'));
});
gulp.task('build.js.material', function(done) {
runSequence('build.js.dev', 'build.css.material', done);
});
gulp.task('build.dart2js.material', function(done) {
runSequence('build.dart', 'build.css.material', done);
});
// TODO: this target is temporary until we find a way to use the SASS transformer

9
modules/angular2_material/src/components/checkbox/checkbox.js vendored
View File

@ -19,7 +19,7 @@ import {NumberWrapper} from 'angular2/src/facade/lang';
'tabindex': 'tabindex',
'role': 'attr.role',
'checked': 'attr.aria-checked',
'disabled_': 'attr.aria-disabled'
'disabled': 'attr.aria-disabled'
}
})
@View({
@ -31,7 +31,7 @@ export class MdCheckbox {
checked: boolean;
/** Whether this checkbox is disabled. */
disabled_: boolean;
_disabled: boolean;
/** Setter for `role` attribute. */
role: string;
@ -43,14 +43,15 @@ export class MdCheckbox {
this.role = 'checkbox';
this.checked = false;
this.tabindex = isPresent(tabindex) ? NumberWrapper.parseInt(tabindex, 10) : 0;
this._disabled = false;
}
get disabled() {
return this.disabled_;
return this._disabled;
}
set disabled(value) {
this.disabled_ = isPresent(value) && value !== false;
this._disabled = isPresent(value) && value !== false;
}
onKeydown(event: KeyboardEvent) {

8
modules/angular2_material/src/components/radio/radio_button.js vendored
View File

@ -77,8 +77,8 @@ export class MdRadioButton {
constructor(
@Optional() @Parent() radioGroup: MdRadioGroup,
@Attribute('id') id: string,
@Attribute('tabindex') tabindex: string,
@Attribute('id') id: String,
@Attribute('tabindex') tabindex: String,
radioDispatcher: MdRadioDispatcher) {
// Assertions. Ideally these should be stripped out by the compiler.
// TODO(jelbourn): Assert that there's no name binding AND a parent radio group.
@ -213,8 +213,8 @@ export class MdRadioGroup {
role: string;
constructor(
@Attribute('tabindex') tabindex: string,
@Attribute('disabled') disabled: string,
@Attribute('tabindex') tabindex: String,
@Attribute('disabled') disabled: String,
radioDispatcher: MdRadioDispatcher) {
this.name_ = `md-radio-group-${_uniqueIdCounter++}`;
this.radios_ = [];

10
modules/examples/e2e_test/material/button_spec.es6 Normal file
View File

@ -0,0 +1,10 @@
var testUtil = require('angular2/src/test_lib/e2e_util');
describe('md-button', function () {
var url = 'examples/src/material/button/index.html';
beforeEach(() => { browser.get(url); });
afterEach(testUtil.verifyNoBrowserErrors);
// Buttons are broken right now, see https://github.com/angular/angular/issues/1602
});

18
modules/examples/e2e_test/material/checkbox_spec.es6 Normal file
View File

@ -0,0 +1,18 @@
var testUtil = require('angular2/src/test_lib/e2e_util');
describe('md-checkbox', function () {
var url = 'examples/src/material/checkbox/index.html';
beforeEach(() => { browser.get(url); });
afterEach(testUtil.verifyNoBrowserErrors);
it('should toggle a checkbox', function() {
var checkbox = element.all(by.css('md-checkbox')).first();
checkbox.click();
expect(checkbox.getAttribute('aria-checked')).toBe('true');
checkbox.click();
expect(checkbox.getAttribute('aria-checked')).toBe('false');
});
});

19
modules/examples/e2e_test/material/dialog_spec.es6 Normal file
View File

@ -0,0 +1,19 @@
var testUtil = require('angular2/src/test_lib/e2e_util');
describe('md-dialog', function () {
var url = 'examples/src/material/dialog/index.html';
beforeEach(() => { browser.get(url); });
afterEach(testUtil.verifyNoBrowserErrors);
it('should open a dialog', function() {
var openButton = element(by.id('open'));
openButton.click();
expect(element(by.css('.md-dialog')).isPresent()).toBe(true);
var dialog = element(by.css('.md-dialog'));
dialog.sendKeys(protractor.Key.ESCAPE);
expect(element(by.css('.md-dialog')).isPresent()).toBe(false);
});
});

23
modules/examples/e2e_test/material/progress_linear_spec.es6 Normal file
View File

@ -0,0 +1,23 @@
var testUtil = require('angular2/src/test_lib/e2e_util');
describe('md-progress-linear', function () {
var url = 'examples/src/material/progress-linear/index.html';
beforeEach(() => { browser.get(url); });
afterEach(testUtil.verifyNoBrowserErrors);
it('should increment and decrement progress', function() {
var progressBar = element.all(by.css('md-progress-linear')).first();
var incrementButton = element(by.id('increment'));
var decrementButton = element(by.id('decrement'));
var initialValue = progressBar.getAttribute('aria-valuenow');
incrementButton.click();
expect(progressBar.getAttribute('aria-valuenow')).toBeGreaterThan(initialValue);
decrementButton.click();
decrementButton.click();
expect(progressBar.getAttribute('aria-valuenow')).toBeLessThan(initialValue);
});
});

10
modules/examples/e2e_test/material/radio_spec.es6 Normal file
View File

@ -0,0 +1,10 @@
var testUtil = require('angular2/src/test_lib/e2e_util');
describe('md-radio-button', function () {
var url = 'examples/src/material/radio/index.html';
beforeEach(() => { browser.get(url); });
afterEach(testUtil.verifyNoBrowserErrors);
// Radio buttons are broken right now, see https://github.com/angular/angular/issues/1643
});

3
modules/examples/src/material/button/index.html
View File

@ -7,10 +7,7 @@
<style> * { font-family: RobotoDraft, Roboto, 'Helvetica Neue', sans-serif; } </style>
</head>
<body>
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

9
modules/examples/src/material/checkbox/index.html
View File

@ -4,15 +4,10 @@
<meta charset="UTF-8">
<title>ng-material checkbox demo</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic">
<style>
* {
font-family: RobotoDraft, Roboto;
}
</style>
<style> * { font-family: RobotoDraft, Roboto; } </style>
</head>
<body>
$SCRIPTS$
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

13
modules/examples/src/material/demo_common.js
View File

@ -48,10 +48,17 @@ export class DemoUrlResolver extends UrlResolver {
return `${baseUrl}/${url}`;
}
if (this.isInPubServe) {
return `/packages/${url}`;
// Whether the `examples/` dir is being directly served (as the server root).
// For cases when this is not true AND we're in pub-serve, `examples/` needs to be
// prepended to the URL.
var isDirectlyServingExamplesDir = !StringWrapper.contains(baseUrl, 'examples/');
if (this.isInPubServe && isDirectlyServingExamplesDir) {
return `/packages/${url}`;
} else if (this.isInPubServe) {
return `/examples/packages/${url}`;
} else {
return `/${url}`;
return `/${url}`;
}
}
}

2
modules/examples/src/material/dialog/demo_app.html
View File

@ -1,7 +1,7 @@
<div>
<h2>Dialog demo</h2>
<button type="button" (click)="open()" [disabled]="!!dialogRef">
<button id="open" type="button" (click)="open()" [disabled]="!!dialogRef">
Open a dialog
</button>

11
modules/examples/src/material/dialog/index.html
View File

@ -4,15 +4,10 @@
<meta charset="UTF-8">
<title>ng-material dialog demo</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic">
<style>
* {
font-family: RobotoDraft, Roboto;
}
</style>
<style> * { font-family: RobotoDraft, Roboto; } </style>
</head>
<body>
$SCRIPTS$
<body class="dialog-demo">
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

11
modules/examples/src/material/grid_list/index.html
View File

@ -4,17 +4,10 @@
<meta charset="UTF-8">
<title>ng-material grid-list demo</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic">
<style>
* {
font-family: RobotoDraft, Roboto;
}
</style>
<style> * { font-family: RobotoDraft, Roboto; } </style>
</head>
<body>
$SCRIPTS$
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

10
modules/examples/src/material/input/index.html
View File

@ -4,16 +4,12 @@
<meta charset="UTF-8">
<title>ng-material input demo</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic">
<style>
* {
font-family: RobotoDraft, Roboto;
}
</style>
<style> * { font-family: RobotoDraft, Roboto; } </style>
</head>
<body>
$SCRIPTS$
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

4
modules/examples/src/material/progress-linear/demo_app.html
View File

@ -37,6 +37,6 @@
<!--<md-progress-linear></md-progress-linear>-->
<p>Progress: {{progress}}</p>
<button type="button" (click)="step(10)">Increment</button>
<button type="button" (click)="step(-10)">Decrement</button>
<button type="button" (click)="step(10)" id="increment">Increment</button>
<button type="button" (click)="step(-10)" id="decrement">Decrement</button>
</div>

9
modules/examples/src/material/progress-linear/index.html
View File

@ -4,15 +4,12 @@
<meta charset="UTF-8">
<title>ng-material progress-linear demo</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic">
<style>
* {
font-family: RobotoDraft, Roboto;
}
</style>
<style> * { font-family: RobotoDraft, Roboto; } </style>
</head>
<body>
$SCRIPTS$
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

2
modules/examples/src/material/radio/demo_app.html
View File

@ -2,7 +2,7 @@
<h2>Radio buttons</h2>
<h3>Inside of a radiogroup</h3>
<md-radio-group #scifi (change)="onGroupChange()">
<md-radio-group #scifi (change)="onGroupChange()" id="scifi-group">
<md-radio-button value="star-wars">Star Wars</md-radio-button>
<md-radio-button value="star-trek" id="special-radio">Star Trek</md-radio-button>
<md-radio-button value="bsg" disabled>Battlestar Galactica</md-radio-button>

9
modules/examples/src/material/radio/index.html
View File

@ -4,17 +4,12 @@
<meta charset="UTF-8">
<title>ng-material radio demo</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic">
<style>
* {
font-family: RobotoDraft, Roboto;
}
</style>
<style> * { font-family: RobotoDraft, Roboto; } </style>
</head>
<body>
$SCRIPTS$
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

4
modules/examples/src/material/switcher/index.html
View File

@ -12,8 +12,8 @@
</head>
<body>
$SCRIPTS$
<demo-app>Loading...</demo-app>
$SCRIPTS$
</body>
</html>

2
scripts/ci/test_e2e_dart.sh
View File

@ -15,6 +15,8 @@ function killServer () {
./node_modules/.bin/gulp serve.js.dart2js&
serverPid=$!
./node_modules/.bin/gulp build.css.material&
trap killServer EXIT
# wait for server to come up!

2
scripts/ci/test_e2e_js.sh
View File

@ -15,6 +15,8 @@ function killServer () {
./node_modules/.bin/gulp serve.js.prod&
serverPid=$!
./node_modules/.bin/gulp build.css.material&
trap killServer EXIT
# wait for server to come up!