Merge branch 'master' of https://github.com/SteveVanOpstal/LegendBuilder

SteveVanOpstal · Mar 31, 2016 · 18b9ade · 18b9ade
2 parents ba0f904 + 2cbe627
commit 18b9ade
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ before_script:
   - sleep 3 # give xvfb some time to start
 
 script:
-  - npm run ci
+  - npm run test
 
 after_script:
   - npm run coveralls
diff --git a/src/app/routes/choose.component.e2e.ts b/src/app/routes/choose.component.e2e.ts
@@ -1,11 +1,17 @@
 'use strict';
 describe('ChooseRoute', () => {
 
-  beforeEach(() => {
+  // Temporary fix for zone.js issue #234 (TODO: remove)
+  beforeEach((done) => {
     browser.get('/euw');
+    element(by.css('body')).isPresent().then(() => {
+      done();
+    }, () => {
+      //error skipped
+      done();
+    })
   });
 
-
   it('should have a title', () => {
     expect(browser.getTitle()).toEqual('Legend Builder');
   });

diff --git a/src/app/routes/region.component.e2e.ts b/src/app/routes/region.component.e2e.ts
@@ -1,8 +1,15 @@
 'use strict';
 describe('RegionsComponent', () => {
 
-  beforeEach(() => {
+  // Temporary fix for zone.js issue #234 (TODO: remove)
+  beforeEach((done) => {
     browser.get('/');
+    element(by.css('body')).isPresent().then(() => {
+      done();
+    }, () => {
+      //error skipped
+      done();
+    })
   });
 
 
@@ -11,7 +18,7 @@ describe('RegionsComponent', () => {
   });
 
   it('should select EUW', () => {
-    element(by.css('region button[href=\'/euw\']')).click();
+    element(by.css('region button[href="/euw"]')).click();
 
     browser.driver.getCurrentUrl().then(function(url) {
       expect(/\.*\/euw/.test(url)).toBeTruthy();