chore(tap): fix isKeyboardElement test

ionic-team · Apr 12, 2015 · 6a27fef · 6a27fef
1 parent 018b49f
commit 6a27fef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/test/unit/angular/directive/keyboardAttach.unit.js b/test/unit/angular/directive/keyboardAttach.unit.js
@@ -1,6 +1,6 @@
 describe('keyboardAttach directive', function() {
   beforeEach(module('ionic'));
-  
+
   function setup() {
     var el, content;
     inject(function($compile, $rootScope) {
@@ -12,7 +12,7 @@ describe('keyboardAttach directive', function() {
     });
     return {el: el, content: content};
   }
-  
+
   it('should move up when window fires native.showkeyboard event', function() {
     var el = setup().el;
     ionic.Platform.isFullScreen = true;
@@ -38,13 +38,14 @@ describe('keyboardAttach directive', function() {
 
   it('should do nothing if Android and not fullscreen', function() {
     var el = setup().el;
+    ionic.Platform.setPlatform('android');
     ionic.Platform.isFullScreen = false;
     expect(el.css('bottom')).toEqual('');
     ionic.trigger('native.showkeyboard', { target: window, keyboardHeight: 33 });
     expect(el.css('bottom')).toEqual('');
     el.scope().$destroy();
   });
-  
+
   it('should remove listeners on destroy', function() {
     spyOn(ionic, 'off');
     var el = setup().el;

diff --git a/test/unit/utils/tap.unit.js b/test/unit/utils/tap.unit.js
@@ -94,6 +94,8 @@ describe('Ionic Tap', function() {
 
     deregisterTap = ionic.tap.register(document.createElement('div'));
     ionic.scroll = { isScrolling: false };
+    ionic.Platform.setPlatform(null);
+    ionic.Platform._checkPlatforms();
   });
 
   afterEach(function(){
@@ -1270,7 +1272,6 @@ describe('Ionic Tap', function() {
     expect( ionic.tap.isKeyboardElement(null) ).toEqual(false);
 
     ionic.Platform.setPlatform('ios');
-    ionic.Platform.ua = 'iPhone';
 
     var ele = document.createElement('input');
     ele.type = 'date';