diff --git a/src/config/test/config.spec.ts b/src/config/test/config.spec.ts index 3e75db43f2..b734ad2ec2 100644 --- a/src/config/test/config.spec.ts +++ b/src/config/test/config.spec.ts @@ -2,12 +2,14 @@ import {Config, Platform, ionicProviders} from '../../../src'; export function run() { +describe('Config', () => { + it('should set activator setting to none for old Android Browser on a linux device', () => { let config = new Config(); let platform = new Platform(); platform.setUserAgent('Mozilla/5.0 (Linux; U; Android 4.2.2; nl-nl; GT-I9505 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'); platform.setNavigatorPlatform('linux'); - platform.load(null); + platform.load(); config.setPlatform(platform); expect(config.get('activator')).toEqual('none'); @@ -18,7 +20,7 @@ export function run() { let platform = new Platform(); platform.setUserAgent('Mozilla/5.0 (Linux; U; Android 4.2.2; nl-nl; GT-I9505 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'); platform.setNavigatorPlatform('MacIntel'); - platform.load(null); + platform.load(); config.setPlatform(platform); expect(config.get('activator')).toEqual('ripple'); @@ -29,7 +31,7 @@ export function run() { let platform = new Platform(); platform.setUserAgent('Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1650.59 Mobile Safari/537.36'); platform.setNavigatorPlatform('linux'); - platform.load(null); + platform.load(); config.setPlatform(platform); expect(config.get('activator')).toEqual('none'); @@ -40,7 +42,7 @@ export function run() { let platform = new Platform(); platform.setUserAgent('Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1650.59 Mobile Safari/537.36'); platform.setNavigatorPlatform('linux'); - platform.load(null); + platform.load(); config.setPlatform(platform); expect(config.get('activator')).toEqual('ripple'); @@ -51,7 +53,7 @@ export function run() { let platform = new Platform(); platform.setUserAgent('Mozilla/5.0 (Android 5.0; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0'); platform.setNavigatorPlatform('linux'); - platform.load(null); + platform.load(); config.setPlatform(platform); expect(config.get('activator')).toEqual('ripple'); @@ -62,7 +64,7 @@ export function run() { let platform = new Platform(); platform.setUserAgent('Mozilla/5.0 (Android 4.4; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0'); platform.setNavigatorPlatform('linux'); - platform.load(null); + platform.load(); config.setPlatform(platform); expect(config.get('activator')).toEqual('none'); @@ -105,7 +107,7 @@ export function run() { config.setPlatform(platform); expect(config.get('mode')).toEqual('md'); - expect(config.get('tabsPlacement')).toEqual('top'); + expect(config.get('tabsHighlight')).toEqual(true); }); it('should override mode settings from platforms setting', () => { @@ -120,7 +122,7 @@ export function run() { config.setPlatform(platform); expect(config.get('mode')).toEqual('md'); - expect(config.get('tabsPlacement')).toEqual('top'); + expect(config.get('tabsHighlight')).toEqual(true); }); it('should get boolean value from querystring', () => { @@ -259,7 +261,7 @@ export function run() { let platform = new Platform(['android']); config.setPlatform(platform); - expect(config.get('tabsPlacement')).toEqual('top'); + expect(config.get('tabsHighlight')).toEqual(true); }); it('should get setting from ios mode', () => { @@ -562,4 +564,6 @@ export function run() { expect(config.settings()).toEqual({}); }); +}); + }