This reverts commit 351610ca8db31b22c89994de6aa31a015be95082. PR Close #28438
This commit is contained in:
parent
7c157780a9
commit
cbed4851a3
@ -6,7 +6,6 @@
|
|||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {fixmeIvy} from '@angular/private/testing';
|
|
||||||
import {$, ExpectedConditions, browser, by, element} from 'protractor';
|
import {$, ExpectedConditions, browser, by, element} from 'protractor';
|
||||||
|
|
||||||
import {verifyNoBrowserErrors} from '../../../../test-utils';
|
import {verifyNoBrowserErrors} from '../../../../test-utils';
|
||||||
@ -17,11 +16,8 @@ function waitForElement(selector: string) {
|
|||||||
browser.wait(EC.presenceOf($(selector)), 20000);
|
browser.wait(EC.presenceOf($(selector)), 20000);
|
||||||
}
|
}
|
||||||
|
|
||||||
fixmeIvy(
|
describe('ngComponentOutlet', () => {
|
||||||
'unknown. Run "yarn bazel run packages/examples/common:devserver --define=compile=aot" ' +
|
const URL = 'common/ngComponentOutlet/ts/';
|
||||||
'to debug')
|
|
||||||
.describe('ngComponentOutlet', () => {
|
|
||||||
const URL = '/ngComponentOutlet';
|
|
||||||
afterEach(verifyNoBrowserErrors);
|
afterEach(verifyNoBrowserErrors);
|
||||||
|
|
||||||
describe('ng-component-outlet-example', () => {
|
describe('ng-component-outlet-example', () => {
|
||||||
@ -34,9 +30,7 @@ fixmeIvy(
|
|||||||
it('should render complete', () => {
|
it('should render complete', () => {
|
||||||
browser.get(URL);
|
browser.get(URL);
|
||||||
waitForElement('ng-component-outlet-complete-example');
|
waitForElement('ng-component-outlet-complete-example');
|
||||||
expect(element.all(by.css('complete-component')).getText()).toEqual([
|
expect(element.all(by.css('complete-component')).getText()).toEqual(['Complete: AhojSvet!']);
|
||||||
'Complete: AhojSvet!'
|
|
||||||
]);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should render other module', () => {
|
it('should render other module', () => {
|
||||||
@ -47,4 +41,4 @@ fixmeIvy(
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {fixmeIvy} from '@angular/private/testing';
|
|
||||||
import {$, ExpectedConditions, browser, by, element} from 'protractor';
|
import {$, ExpectedConditions, browser, by, element} from 'protractor';
|
||||||
import {verifyNoBrowserErrors} from '../../../../test-utils';
|
import {verifyNoBrowserErrors} from '../../../../test-utils';
|
||||||
|
|
||||||
@ -45,9 +44,7 @@ describe('ngIf', () => {
|
|||||||
|
|
||||||
describe('ng-if-then-else', () => {
|
describe('ng-if-then-else', () => {
|
||||||
let comp = 'ng-if-then-else';
|
let comp = 'ng-if-then-else';
|
||||||
|
it('should hide/show content', () => {
|
||||||
fixmeIvy('unknown. Run "yarn bazel run packages/examples/common:devserver" to debug')
|
|
||||||
.it('should hide/show content', () => {
|
|
||||||
browser.get(URL);
|
browser.get(URL);
|
||||||
waitForElement(comp);
|
waitForElement(comp);
|
||||||
expect(element.all(by.css(comp)).get(0).getText())
|
expect(element.all(by.css(comp)).get(0).getText())
|
||||||
@ -57,8 +54,7 @@ describe('ngIf', () => {
|
|||||||
.toEqual('hideSwitch Primary show = true\nSecondary text to show');
|
.toEqual('hideSwitch Primary show = true\nSecondary text to show');
|
||||||
element.all(by.css(comp + ' button')).get(0).click();
|
element.all(by.css(comp + ' button')).get(0).click();
|
||||||
expect(element.all(by.css(comp)).get(0).getText())
|
expect(element.all(by.css(comp)).get(0).getText())
|
||||||
.toEqual(
|
.toEqual('showSwitch Primary show = false\nAlternate text while primary text is hidden');
|
||||||
'showSwitch Primary show = false\nAlternate text while primary text is hidden');
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -6,22 +6,17 @@
|
|||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {fixmeIvy} from '@angular/private/testing';
|
|
||||||
import {ElementArrayFinder, ElementFinder, browser, by, element} from 'protractor';
|
import {ElementArrayFinder, ElementFinder, browser, by, element} from 'protractor';
|
||||||
|
import {verifyNoBrowserErrors} from '../../../../_common/e2e_util';
|
||||||
|
|
||||||
import {verifyNoBrowserErrors} from '../../../../test-utils';
|
describe('simpleNgModel example', () => {
|
||||||
|
|
||||||
fixmeIvy(
|
|
||||||
'unkown; verifyNoBrowserErrors fails due to "ExpressionChangedAfterItHasBeenCheckedError"' +
|
|
||||||
'Debug by running "yarn bazel run //packages/examples/forms:devserver --define=compile=aot')
|
|
||||||
.describe('simpleNgModel example', () => {
|
|
||||||
afterEach(verifyNoBrowserErrors);
|
afterEach(verifyNoBrowserErrors);
|
||||||
let input: ElementFinder;
|
let input: ElementFinder;
|
||||||
let paragraphs: ElementArrayFinder;
|
let paragraphs: ElementArrayFinder;
|
||||||
let button: ElementFinder;
|
let button: ElementFinder;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
browser.get('/simpleNgModel');
|
browser.get('/forms/ts/simpleNgModel/index.html');
|
||||||
input = element(by.css('input'));
|
input = element(by.css('input'));
|
||||||
paragraphs = element.all(by.css('p'));
|
paragraphs = element.all(by.css('p'));
|
||||||
button = element(by.css('button'));
|
button = element(by.css('button'));
|
||||||
@ -47,4 +42,4 @@ fixmeIvy(
|
|||||||
expect(input.getAttribute('value')).toEqual('Nancy');
|
expect(input.getAttribute('value')).toEqual('Nancy');
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {fixmeIvy} from '@angular/private/testing';
|
|
||||||
import {browser, by, element} from 'protractor';
|
import {browser, by, element} from 'protractor';
|
||||||
import {verifyNoBrowserErrors} from '../../../../../test-utils';
|
import {verifyNoBrowserErrors} from '../../../../../test-utils';
|
||||||
|
|
||||||
@ -29,8 +28,7 @@ describe('upgrade/static (full)', () => {
|
|||||||
expect(heroComponents.count()).toEqual(3);
|
expect(heroComponents.count()).toEqual(3);
|
||||||
});
|
});
|
||||||
|
|
||||||
fixmeIvy('unknown; <ng1Hero> component does not seem to render name & description')
|
it('should add a new hero when the "Add Hero" button is pressed', () => {
|
||||||
.it('should add a new hero when the "Add Hero" button is pressed', () => {
|
|
||||||
const addHeroButton = element.all(by.css('button')).last();
|
const addHeroButton = element.all(by.css('button')).last();
|
||||||
expect(addHeroButton.getText()).toEqual('Add Hero');
|
expect(addHeroButton.getText()).toEqual('Add Hero');
|
||||||
addHeroButton.click();
|
addHeroButton.click();
|
||||||
@ -38,8 +36,7 @@ describe('upgrade/static (full)', () => {
|
|||||||
expect(heroComponents.last().element(by.css('h2')).getText()).toEqual('Kamala Khan');
|
expect(heroComponents.last().element(by.css('h2')).getText()).toEqual('Kamala Khan');
|
||||||
});
|
});
|
||||||
|
|
||||||
fixmeIvy('unknown; <ng1Hero> component does not seem to render name & description')
|
it('should remove a hero when the "Remove" button is pressed', () => {
|
||||||
.it('should remove a hero when the "Remove" button is pressed', () => {
|
|
||||||
let firstHero = element.all(by.css('ng1-hero')).get(0);
|
let firstHero = element.all(by.css('ng1-hero')).get(0);
|
||||||
expect(firstHero.element(by.css('h2')).getText()).toEqual('Superman');
|
expect(firstHero.element(by.css('h2')).getText()).toEqual('Superman');
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {fixmeIvy} from '@angular/private/testing';
|
|
||||||
import {ElementArrayFinder, ElementFinder, browser, by, element} from 'protractor';
|
import {ElementArrayFinder, ElementFinder, browser, by, element} from 'protractor';
|
||||||
import {verifyNoBrowserErrors} from '../../../../../test-utils';
|
import {verifyNoBrowserErrors} from '../../../../../test-utils';
|
||||||
|
|
||||||
@ -59,8 +58,7 @@ describe('upgrade/static (lite)', () => {
|
|||||||
|
|
||||||
it('should initially not render the heroes', () => expectHeroes(false));
|
it('should initially not render the heroes', () => expectHeroes(false));
|
||||||
|
|
||||||
fixmeIvy('unknown; <ng1Hero> component does not seem to render name & description')
|
it('should toggle the heroes when clicking the "show/hide" button', () => {
|
||||||
.it('should toggle the heroes when clicking the "show/hide" button', () => {
|
|
||||||
showHideBtn.click();
|
showHideBtn.click();
|
||||||
expectHeroes(true);
|
expectHeroes(true);
|
||||||
|
|
||||||
@ -68,8 +66,7 @@ describe('upgrade/static (lite)', () => {
|
|||||||
expectHeroes(false);
|
expectHeroes(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
fixmeIvy('unknown; <ng1Hero> component does not seem to render name & description')
|
it('should add a new hero when clicking the "add" button', () => {
|
||||||
.it('should add a new hero when clicking the "add" button', () => {
|
|
||||||
showHideBtn.click();
|
showHideBtn.click();
|
||||||
ng2HeroesAddBtn.click();
|
ng2HeroesAddBtn.click();
|
||||||
|
|
||||||
@ -77,8 +74,7 @@ describe('upgrade/static (lite)', () => {
|
|||||||
expect(ng1Heroes.last()).toHaveName('Kamala Khan');
|
expect(ng1Heroes.last()).toHaveName('Kamala Khan');
|
||||||
});
|
});
|
||||||
|
|
||||||
fixmeIvy('unknown; <ng1Hero> component does not seem to render name & description')
|
it('should remove a hero when clicking its "remove" button', () => {
|
||||||
.it('should remove a hero when clicking its "remove" button', () => {
|
|
||||||
showHideBtn.click();
|
showHideBtn.click();
|
||||||
|
|
||||||
const firstHero = ng1Heroes.first();
|
const firstHero = ng1Heroes.first();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user