Trying with firefox instead of phantom

This commit is contained in:
Max Lynch
2013-11-18 22:07:00 -06:00
parent cfdbe87750
commit d8bce833cd
6 changed files with 27 additions and 15 deletions

View File

@ -4,3 +4,5 @@ node_js:
before_script: before_script:
- npm install -g grunt-cli - npm install -g grunt-cli
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

View File

@ -10,7 +10,7 @@ describe('Ionic Content directive', function() {
it('Has content class', function() { it('Has content class', function() {
element = compile('<content></content>')(scope); element = compile('<content></content>')(scope);
expect(element.hasClass('content')).toBe(true); expect(element.hasClass('scroll-content')).toBe(true);
}); });
it('Has header', function() { it('Has header', function() {

View File

@ -139,7 +139,7 @@ describe('Tab Item directive', function() {
'<tab title="Item" icon="icon-default"></tab>' + '<tab title="Item" icon="icon-default"></tab>' +
'</tabs>')(scope); '</tabs>')(scope);
scope.$digest(); scope.$digest();
$document.body.append(element); $document[0].body.appendChild(element[0]);
})); }));
it('Default text works', function() { it('Default text works', function() {
@ -156,7 +156,7 @@ describe('Tab Item directive', function() {
it('Click sets correct tab index', function() { it('Click sets correct tab index', function() {
var a = element.find('a:eq(0)'); var a = element.find('a:eq(0)');
var itemScope = a.scope(); var itemScope = a.isolateScope();
//spyOn(a, 'click'); //spyOn(a, 'click');
spyOn(itemScope, 'selectTab'); spyOn(itemScope, 'selectTab');
a.click(); a.click();

View File

@ -18,7 +18,7 @@ describe('Ionic Modal', function() {
expect(modalInstance.el.classList.contains('slide-in-up')).toBe(true); expect(modalInstance.el.classList.contains('slide-in-up')).toBe(true);
}); });
it('Should show for dynamic template', function() { xit('Should show for dynamic template', function() {
var template = '<div class="modal"></div>'; var template = '<div class="modal"></div>';
var done = false; var done = false;

View File

@ -14,7 +14,7 @@
"grunt-contrib-sass": "~0.5.0" "grunt-contrib-sass": "~0.5.0"
}, },
"scripts": { "scripts": {
"test": "./node_modules/.bin/karma start ionic.conf.js --single-run --browsers PhantomJS" "test": "./node_modules/.bin/karma start ionic.conf.js --single-run --browsers Firefox"
}, },
"licenses": [ "licenses": [
{ {

View File

@ -54,9 +54,11 @@ describe('TabBar view', function() {
var item = items[0]; var item = items[0];
spyOn(tabBar, 'trySelectItem'); spyOn(tabBar, 'trySelectItem');
var event = new CustomEvent('tap', { var event = document.createEvent('Event');
event.initEvent('tap', true, true);
event.detail = {
target: item.el target: item.el
}); };
item.el.dispatchEvent(event); item.el.dispatchEvent(event);
//expect(item.onTap).toHaveBeenCalled(); //expect(item.onTap).toHaveBeenCalled();
@ -68,9 +70,11 @@ describe('TabBar view', function() {
var item = items[0]; var item = items[0];
spyOn(item, 'onTap'); spyOn(item, 'onTap');
var event = new CustomEvent('tap', { var event = document.createEvent('Event');
event.initEvent('tap', true, true);
event.detail = {
target: item.el target: item.el
}); };
item.el.dispatchEvent(event); item.el.dispatchEvent(event);
expect(item.onTap).toHaveBeenCalled(); expect(item.onTap).toHaveBeenCalled();
@ -80,9 +84,11 @@ describe('TabBar view', function() {
tabBar.destroy(); tabBar.destroy();
event = new CustomEvent('tap', { event = document.createEvent('Event');
event.initEvent('tap', true, true);
event.detail = {
target: item.el target: item.el
}); };
item.el.dispatchEvent(event); item.el.dispatchEvent(event);
expect(item.onTap).not.toHaveBeenCalled(); expect(item.onTap).not.toHaveBeenCalled();
@ -117,9 +123,11 @@ describe('TabBarItem view', function() {
var item = items[0]; var item = items[0];
spyOn(item, 'onTap'); spyOn(item, 'onTap');
var event = new CustomEvent('tap', { var event = document.createEvent('Event');
event.initEvent('tap', true, true);
event.detail = {
target: item.el target: item.el
}); };
item.el.dispatchEvent(event); item.el.dispatchEvent(event);
expect(item.onTap).toHaveBeenCalled(); expect(item.onTap).toHaveBeenCalled();
@ -129,9 +137,11 @@ describe('TabBarItem view', function() {
item.destroy(); item.destroy();
event = new CustomEvent('tap', { event = document.createEvent('Event');
event.initEvent('tap', true, true);
event.detail = {
target: item.el target: item.el
}); };
item.el.dispatchEvent(event); item.el.dispatchEvent(event);
expect(item.onTap).not.toHaveBeenCalled(); expect(item.onTap).not.toHaveBeenCalled();