From d836b13abdc4ab4e36928e69ab51afb105cb0ea3 Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Sat, 14 Jan 2017 18:54:34 +0100 Subject: [PATCH 1/6] tests(circleCI): changing node version to 6.9.4 to avoid phantomjs installation error https://github.com/Medium/phantomjs/issues/659 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e02df9fb7..4ba3e26e4 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 4.1.0 + version: 6.9.4 ruby: version: 2.1.2 checkout: From c41271712502d2bd74323363d76992bb2b40fbe7 Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Sat, 14 Jan 2017 19:03:46 +0100 Subject: [PATCH 2/6] tests(circleCI): adding bower to devDeps to avoid `bower install` error --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index fb0aac886..5cb1f4a2e 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "url": "git://github.com/ionic-team/ionic.git" }, "devDependencies": { + "bower": "^1.8.0", "canonical-path": "0.0.2", "chalk": "^0.4.0", "connect": "^2.13.0", From 71758cbe9b51717a4ff4b50ba8c33105fe86533a Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Sat, 14 Jan 2017 14:59:02 +0100 Subject: [PATCH 3/6] fix(tests): fixing errors caused by commit 417997d --- js/utils/tap.js | 2 +- test/unit/utils/tap.unit.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/utils/tap.js b/js/utils/tap.js index cf31d7f2c..c22fee41e 100644 --- a/js/utils/tap.js +++ b/js/utils/tap.js @@ -486,7 +486,7 @@ function tapIgnoreEvent(e) { return true; } - if(e.target.tagName == 'SELECT') { + if(e.target && e.target.tagName == 'SELECT') { return true; } diff --git a/test/unit/utils/tap.unit.js b/test/unit/utils/tap.unit.js index 56a191d0f..2c53038f5 100644 --- a/test/unit/utils/tap.unit.js +++ b/test/unit/utils/tap.unit.js @@ -446,7 +446,7 @@ describe('Ionic Tap', function() { preventDefault:function(){ this.preventedDefault = true; } }; tapTouchEnd(e); - expect( e.preventedDefault ).toEqual(true); + expect( e.preventedDefault ).toBeUndefined(); e = { target: document.createElement('div'), @@ -526,7 +526,7 @@ describe('Ionic Tap', function() { stopPropagation: function(){ this.stoppedPropagation = true; } }; tapMouseDown(e); - expect( e.stoppedPropagation ).toEqual(true); + expect( e.stoppedPropagation ).toBeUndefined(); expect( e.defaultedPrevented ).toBeUndefined(); e = { From 9582f586d0c51d15c5f66dd85c38a852949bebeb Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Sat, 14 Jan 2017 14:59:45 +0100 Subject: [PATCH 4/6] fix(tests): removed reference to inexistent file js/utils/list.js the error launching tests was the following: WARN [watcher]: Pattern "./js/utils/list.js" does not match any file. --- config/build.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/config/build.config.js b/config/build.config.js index 405f25f4b..e7250cd2b 100644 --- a/config/build.config.js +++ b/config/build.config.js @@ -48,7 +48,6 @@ module.exports = { 'js/utils/tap.js', 'js/utils/activator.js', 'js/utils/utils.js', - 'js/utils/list.js', 'js/utils/keyboard.js', 'js/utils/viewport.js', From befe445401f5b6e24acb5a34a091f215f8e9c4ff Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Sat, 14 Jan 2017 15:00:25 +0100 Subject: [PATCH 5/6] fix(tests): sidemenu: fixing values causing tests error on osx when passing 270/4 to openAmount() on osx, ctrl.getOpenAmount() it's equal to 65 but ctrl.left.width/4 it's 67.5. That causes error during karma tests --- test/unit/angular/controller/sideMenuController.unit.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/angular/controller/sideMenuController.unit.js b/test/unit/angular/controller/sideMenuController.unit.js index 039f5605c..430f57383 100644 --- a/test/unit/angular/controller/sideMenuController.unit.js +++ b/test/unit/angular/controller/sideMenuController.unit.js @@ -38,12 +38,12 @@ describe('$ionicSideMenus controller', function() { }, {})); angular.extend(ctrl, {}); ctrl.left = new ionic.views.SideMenu({ - width: 270, + width: 272, el: document.createElement('div'), isEnabled: true }); ctrl.right = new ionic.views.SideMenu({ - width: 270, + width: 272, el: document.createElement('div'), isEnabled: true }); @@ -71,8 +71,8 @@ describe('$ionicSideMenus controller', function() { // Menu widths it('should init widths', function() { - expect(ctrl.left.width).toEqual(270); - expect(ctrl.right.width).toEqual(270); + expect(ctrl.left.width).toEqual(272); + expect(ctrl.right.width).toEqual(272); }); it('should have amount and percentage correct', function() { From 7bc9ab87a6f9f4c2a0dd5e889ff3941e82aeea18 Mon Sep 17 00:00:00 2001 From: Denny Biasiolli Date: Sat, 14 Jan 2017 15:00:56 +0100 Subject: [PATCH 6/6] fix(tests): toggle: correcting click trigger --- test/unit/angular/directive/toggle.unit.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/angular/directive/toggle.unit.js b/test/unit/angular/directive/toggle.unit.js index 44f255273..8d08f5e5a 100644 --- a/test/unit/angular/directive/toggle.unit.js +++ b/test/unit/angular/directive/toggle.unit.js @@ -36,7 +36,7 @@ describe('Ionic Toggle', function() { // Not disabled, we can toggle expect(toggle.val()).toBe(false); - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(true); // Disable it @@ -45,7 +45,7 @@ describe('Ionic Toggle', function() { expect(input.getAttribute('disabled')).toBe('disabled'); // We shouldn't be able to toggle it now - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(true); // Re-enable it @@ -53,7 +53,7 @@ describe('Ionic Toggle', function() { rootScope.$apply(); // Should be able to toggle it now - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(false); expect(input.getAttribute('disabled')).not.toBe('disabled'); }); @@ -62,9 +62,9 @@ describe('Ionic Toggle', function() { var toggle = el.scope().toggle; var label = el[0].querySelector('label'); expect(toggle.val()).toBe(false); - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(true); - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(false); });