Merge branch 'master' of github.com:driftyco/ionic

This commit is contained in:
perry
2015-03-05 10:45:55 -07:00
2 changed files with 3 additions and 4 deletions

View File

@@ -77,10 +77,10 @@ describe('Ionic Angular Side Menu', function() {
sideMenuController.exposeAside(true);
expect(content.offsetX).toEqual(275);
expect(content.getTranslateX()).toEqual(0);
expect(content.element.getAttribute('style').indexOf('translate3d(275px, 0px, 0px)') > -1).toEqual(true);
expect(content.element.getAttribute('style')).toMatch(/translate3d\(275px, 0(px)?, 0(px)?/);
expect(content.element.style.width).toNotEqual('');
sideMenuController.exposeAside(false);
expect(content.element.getAttribute('style').indexOf('translate3d(0px, 0px, 0px)') > -1).toEqual(true);
expect(content.element.getAttribute('style')).toMatch(/translate3d\(0(px)?, 0(px)?, 0(px)?/);
expect(content.getTranslateX()).toEqual(0);
expect(content.offsetX).toEqual(0);
expect(content.element.style.width).toEqual('');