-
Notifications
You must be signed in to change notification settings - Fork 6.8k
refactor: switch e2e tests to async/await #4705
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,27 @@ | ||
| import {browser, by, element, ExpectedConditions} from 'protractor'; | ||
| import {screenshot} from '../../screenshot'; | ||
| import {asyncSpec} from '../../util/index'; | ||
|
|
||
|
|
||
| describe('button', () => { | ||
| describe('disabling behavior', () => { | ||
| beforeEach(() => browser.get('/button')); | ||
|
|
||
| it('should prevent click handlers from executing when disabled', () => { | ||
| it('should prevent click handlers from executing when disabled', asyncSpec(async () => { | ||
| element(by.id('test-button')).click(); | ||
| expect(element(by.id('click-counter')).getText()).toEqual('1'); | ||
| browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))) | ||
| .then(() => screenshot('clicked once')); | ||
|
|
||
| await browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))); | ||
| screenshot('clicked once'); | ||
|
|
||
| element(by.id('disable-toggle')).click(); | ||
| element(by.id('test-button')).click(); | ||
| expect(element(by.id('click-counter')).getText()).toEqual('1'); | ||
| browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))) | ||
| .then(() => screenshot('click disabled')); | ||
| }); | ||
|
|
||
| await browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))); | ||
| screenshot('click disabled'); | ||
| })); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,47 @@ | ||
| import {browser, by, element, Key, ExpectedConditions} from 'protractor'; | ||
| import {screenshot} from '../../screenshot'; | ||
| import {asyncSpec} from '../../util/index'; | ||
|
|
||
| describe('checkbox', function () { | ||
|
|
||
| describe('check behavior', function () { | ||
| describe('checkbox', () => { | ||
|
|
||
| beforeEach(function() { | ||
| browser.get('/checkbox'); | ||
| }); | ||
| describe('check behavior', () => { | ||
| beforeEach(() => browser.get('/checkbox')); | ||
|
|
||
| it('should be checked when clicked, and be unchecked when clicked again', () => { | ||
| it('should be checked when clicked, and unchecked when clicked again', asyncSpec(async () => { | ||
| let checkboxEl = element(by.id('test-checkbox')); | ||
| let inputEl = element(by.css('input[id=input-test-checkbox]')); | ||
| let checked: string; | ||
|
|
||
| screenshot('start'); | ||
| checkboxEl.click(); | ||
| inputEl.getAttribute('checked').then((value: string) => { | ||
| expect(value).toBeTruthy('Expect checkbox "checked" property to be true'); | ||
| browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))) | ||
| .then(() => screenshot('checked')); | ||
| }); | ||
|
|
||
| expect(inputEl.getAttribute('checked')) | ||
| .toBeTruthy('Expect checkbox "checked" property to be true'); | ||
|
|
||
| await browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))); | ||
| screenshot('checked'); | ||
|
|
||
| checkboxEl.click(); | ||
| inputEl.getAttribute('checked').then((value: string) => { | ||
| expect(value).toBeFalsy('Expect checkbox "checked" property to be false'); | ||
| browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))) | ||
| .then(() => screenshot('unchecked')); | ||
| }); | ||
| }); | ||
|
|
||
| expect(inputEl.getAttribute('checked')) | ||
| .toBeFalsy('Expect checkbox "checked" property to be false'); | ||
|
|
||
| await browser.wait(ExpectedConditions.not( | ||
| ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element'))))); | ||
| screenshot('unchecked'); | ||
| })); | ||
|
|
||
| it('should toggle the checkbox when pressing space', () => { | ||
| let inputEl = element(by.css('input[id=input-test-checkbox]')); | ||
|
|
||
| inputEl.getAttribute('checked').then((value: string) => { | ||
| expect(value).toBeFalsy('Expect checkbox "checked" property to be false'); | ||
| }); | ||
|
|
||
| expect(inputEl.getAttribute('checked')) | ||
| .toBeFalsy('Expect checkbox "checked" property to be false'); | ||
| inputEl.sendKeys(Key.SPACE); | ||
|
|
||
| inputEl.getAttribute('checked').then((value: string) => { | ||
| expect(value).toBeTruthy('Expect checkbox "checked" property to be true'); | ||
| }); | ||
| expect(inputEl.getAttribute('checked')) | ||
| .toBeTruthy('Expect checkbox "checked" property to be true'); | ||
| }); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to @vikerman this
asyncSpecwrapper should be unnecessary w/ jasminewd2Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm looks like it. Initially, I was playing around with passing in the
donefunction and calling it at the end, which ended up timing out for failures, because I wasn't wrapping it in a try/catch and callingdone.fail. I guess that was overriding the custom handling fromjasminewd. I've removed theasyncSpecnow and it behaves as expected.