Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

chore(test): move synchronize_spec off of the control flow #5016

Merged
merged 6 commits into from
Nov 9, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 51 additions & 69 deletions spec/basic/synchronize_spec.js
Original file line number Diff line number Diff line change
@@ -1,95 +1,77 @@
describe('synchronizing with slow pages', function() {
beforeEach(function() {
browser.get('index.html#/async');
describe('synchronizing with slow pages', () => {
beforeEach(async () => {
await browser.get('index.html#/async');
});

it('waits for http calls', function() {
var status = element(by.binding('slowHttpStatus'));
var button = element(by.css('[ng-click="slowHttp()"]'));
it('waits for http calls', async () => {
const status = element(by.binding('slowHttpStatus'));
const button = element(by.css('[ng-click="slowHttp()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('not started');

button.click();

expect(status.getText()).toEqual('done');
await button.click();
expect(await status.getText()).toEqual('done');
});

it('waits for long javascript execution', function() {
var status = element(by.binding('slowFunctionStatus'));
var button = element(by.css('[ng-click="slowFunction()"]'));

expect(status.getText()).toEqual('not started');

button.click();
it('waits for long javascript execution', async () => {
const status = element(by.binding('slowFunctionStatus'));
const button = element(by.css('[ng-click="slowFunction()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('done');
await button.click();
expect(await status.getText()).toEqual('done');
});

it('DOES NOT wait for timeout', function() {
var status = element(by.binding('slowTimeoutStatus'));
var button = element(by.css('[ng-click="slowTimeout()"]'));
it('DOES NOT wait for timeout', async () => {
const status = element(by.binding('slowTimeoutStatus'));
const button = element(by.css('[ng-click="slowTimeout()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('not started');

button.click();

expect(status.getText()).toEqual('pending...');
await button.click();
expect(await status.getText()).toEqual('pending...');
});

it('waits for $timeout', function() {
var status = element(by.binding('slowAngularTimeoutStatus'));
var button = element(by.css('[ng-click="slowAngularTimeout()"]'));

expect(status.getText()).toEqual('not started');

button.click();
it('waits for $timeout', async () => {
const status = element(by.binding('slowAngularTimeoutStatus'));
const button = element(by.css('[ng-click="slowAngularTimeout()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('done');
await button.click();
expect(await status.getText()).toEqual('done');
});

it('waits for $timeout then a promise', function() {
var status = element(by.binding(
'slowAngularTimeoutPromiseStatus'));
var button = element(by.css(
'[ng-click="slowAngularTimeoutPromise()"]'));
it('waits for $timeout then a promise', async () => {
const status = element(by.binding('slowAngularTimeoutPromiseStatus'));
const button = element(by.css('[ng-click="slowAngularTimeoutPromise()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('not started');

button.click();

expect(status.getText()).toEqual('done');
await button.click();
expect(await status.getText()).toEqual('done');
});

it('waits for long http call then a promise', function() {
var status = element(by.binding('slowHttpPromiseStatus'));
var button = element(by.css('[ng-click="slowHttpPromise()"]'));

expect(status.getText()).toEqual('not started');

button.click();
it('waits for long http call then a promise', async () => {
const status = element(by.binding('slowHttpPromiseStatus'));
const button = element(by.css('[ng-click="slowHttpPromise()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('done');
await button.click();
expect(await status.getText()).toEqual('done');
});

it('waits for slow routing changes', function() {
var status = element(by.binding('routingChangeStatus'));
var button = element(by.css('[ng-click="routingChange()"]'));
it('waits for slow routing changes', async () => {
const status = element(by.binding('routingChangeStatus'));
const button = element(by.css('[ng-click="routingChange()"]'));
expect(await status.getText()).toEqual('not started');

expect(status.getText()).toEqual('not started');

button.click();

expect(browser.getPageSource()).toMatch('polling mechanism');
await button.click();
expect(await browser.getPageSource()).toMatch('polling mechanism');
});

it('waits for slow ng-include templates to load', function() {
var status = element(by.css('.included'));
var button = element(by.css('[ng-click="changeTemplateUrl()"]'));

expect(status.getText()).toEqual('fast template contents');

button.click();
it('waits for slow ng-include templates to load', async () => {
const status = element(by.css('.included'));
const button = element(by.css('[ng-click="changeTemplateUrl()"]'));
expect(await status.getText()).toEqual('fast template contents');

expect(status.getText()).toEqual('slow template contents');
await button.click();
expect(await status.getText()).toEqual('slow template contents');
});
});
1 change: 1 addition & 0 deletions spec/basicConf.js
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ exports.config = {
// 'basic/mockmodule_spec.js',
// 'basic/navigation_spec.js',
// 'basic/restart_spec.js',
// 'basic/synchronize_spec.js',
],

// Exclude patterns are relative to this directory.
1 change: 1 addition & 0 deletions spec/ciFullConf.js
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ exports.config = {
// 'basic/mockmodule_spec.js',
// 'basic/navigation_spec.js',
// 'basic/restart_spec.js',
// 'basic/synchronize_spec.js',
],

// Exclude patterns are relative to this directory.