javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(platform): fix unit tests for setting platform to null

Browse Source
This commit is contained in:
Andrew
2014-07-21 08:22:07 -06:00
parent 56fbf3b375
commit 7e20424a87
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/utils/platform.js
View File

@@ -11,6 +11,10 @@
*/
ionic.Platform = {
// Put navigator on platform so it can be mocked and set
// the browser does not allow window.navigator to be set
navigator: window.navigator,
/**
* @ngdoc property
* @name ionic.Platform#isReady
@@ -157,7 +161,7 @@
* @returns {boolean} Whether we are running on iPad.
*/
isIPad: function() {
if( /iPad/i.test(window.navigator.platform) ) {
if( /iPad/i.test(ionic.Platform.navigator.platform) ) {
return true;
}
return /iPad/i.test(this.ua);
@@ -211,7 +215,7 @@
} else if(this.ua.indexOf('Windows Phone') > -1) {
platformName = WINDOWS_PHONE;
} else {
platformName = window.navigator.platform && navigator.platform.toLowerCase().split(' ')[0] || '';
platformName = ionic.Platform.navigator.platform && navigator.platform.toLowerCase().split(' ')[0] || '';
}
},
@@ -250,7 +254,7 @@
};
if(versionMatch[pName]) {
v = this.ua.match( versionMatch[pName] );
if(v.length > 2) {
if(v && v.length > 2) {
platformVersion = parseFloat( v[1] + '.' + v[2] );
}
}

19
test/unit/angular/service/platform.unit.js
View File

@@ -5,7 +5,7 @@ describe('Ionic Platform Service', function() {
beforeEach(inject(function($window, $ionicPlatform, $rootScope) {
window = $window;
window.navigator = {
ionic.Platform.navigator = {
platform: ''
};
ionic.Platform.ua = '';
@@ -20,15 +20,6 @@ describe('Ionic Platform Service', function() {
ionic.Platform.setPlatform('iOS');
expect(ionic.Platform.platform()).toEqual('ios');
ionic.Platform.setPlatform('');
expect(ionic.Platform.platform()).toEqual('');
ionic.Platform.setPlatform(null);
expect(ionic.Platform.platform()).toEqual('');
ionic.Platform.setPlatform();
expect(ionic.Platform.platform()).toEqual('');
});
it('set version with device', function() {
@@ -109,10 +100,10 @@ describe('Ionic Platform Service', function() {
expect(ionic.Platform.isIPad()).toEqual(true);
});
it('should be iPad from iPad in window.navigator.platform and webview, but iPhone in user agent', function() {
it('should be iPad from iPad in ionic.Platform.navigator.platform and webview, but iPhone in user agent', function() {
window.cordova = {};
ionic.Platform.ua = 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25';
window.navigator = {
ionic.Platform.navigator = {
platform: 'iPad Simulator'
};
ionic.Platform.setPlatform(undefined);
@@ -120,9 +111,9 @@ describe('Ionic Platform Service', function() {
expect(ionic.Platform.isIPad()).toEqual(true);
});
it('should not be iPad from no in window.navigator.platform, and iPhone in user agent', function() {
it('should not be iPad from no in ionic.Platform.navigator.platform, and iPhone in user agent', function() {
ionic.Platform.ua = 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25';
window.navigator = {};
ionic.Platform.navigator = {};
ionic.Platform.setPlatform(undefined);
ionic.Platform.setVersion(undefined);
expect(ionic.Platform.isIPad()).toEqual(false);