re-enable upgrade-adapter and upgrade-phonecat-1 tests
This commit is contained in:
parent
5e79a1a2b5
commit
2b235fbe65
|
@ -1,3 +1,5 @@
|
||||||
|
import { browser } from 'protractor';
|
||||||
|
|
||||||
export var appLang = {
|
export var appLang = {
|
||||||
appIsTs: false,
|
appIsTs: false,
|
||||||
appIsJs: false,
|
appIsJs: false,
|
||||||
|
@ -24,8 +26,7 @@ export function itIf(cond: boolean, name: string, func: (done: DoneFn) => void):
|
||||||
// TODO Jesus - figure out what's needed here for the new upgrade chapters
|
// TODO Jesus - figure out what's needed here for the new upgrade chapters
|
||||||
// Allow changing bootstrap mode to NG1 for upgrade tests
|
// Allow changing bootstrap mode to NG1 for upgrade tests
|
||||||
export function setProtractorToNg1Mode(): void {
|
export function setProtractorToNg1Mode(): void {
|
||||||
// browser.rootEl = 'body';
|
browser.rootEl = 'body';
|
||||||
|
|
||||||
// let disableNgAnimate = function() {
|
// let disableNgAnimate = function() {
|
||||||
// angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
|
// angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
|
||||||
// $animate.enabled(false);
|
// $animate.enabled(false);
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
'use strict'; // necessary for es6 output in node
|
'use strict'; // necessary for es6 output in node
|
||||||
|
|
||||||
import { browser, element, by } from 'protractor';
|
import { browser, element, by } from 'protractor';
|
||||||
|
import { setProtractorToNg1Mode } from '../protractor-helpers';
|
||||||
|
|
||||||
describe('Upgrade Tests', function () {
|
describe('Upgrade Tests', function () {
|
||||||
|
|
||||||
|
@ -32,6 +33,7 @@ describe('Upgrade Tests', function () {
|
||||||
beforeAll(function () {
|
beforeAll(function () {
|
||||||
browser.get('/index-bootstrap.html');
|
browser.get('/index-bootstrap.html');
|
||||||
setProtractorToNg1Mode();
|
setProtractorToNg1Mode();
|
||||||
|
waitForNg1AsyncBootstrap();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('bootstraps as expected', function () {
|
it('bootstraps as expected', function () {
|
||||||
|
@ -45,6 +47,7 @@ describe('Upgrade Tests', function () {
|
||||||
beforeAll(function () {
|
beforeAll(function () {
|
||||||
browser.get('/index-1-2-hybrid-bootstrap.html');
|
browser.get('/index-1-2-hybrid-bootstrap.html');
|
||||||
setProtractorToNg1Mode();
|
setProtractorToNg1Mode();
|
||||||
|
waitForNg1AsyncBootstrap();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('bootstraps as expected', function () {
|
it('bootstraps as expected', function () {
|
Loading…
Reference in New Issue