Merge pull request #176 from LotteHofstede/e2e-merge-fix

Fixed issue with e2e tests after merging

e2e/search-page/search-page.e2e-spec.ts

@@ -32,8 +32,10 @@ describe('protractor SearchPage', () => {
     scope.then((scopeString: string) => {
       page.setCurrentScope(scopeString);
       page.submitSearchForm();
-      browser.getCurrentUrl().then((url: string) => {
-        expect(url.indexOf('scope=' + encodeURI(scopeString))).toBeGreaterThanOrEqual(0);
+      browser.wait(() => {
+        return browser.getCurrentUrl().then((url: string) => {
+          return url.indexOf('scope=' + encodeURI(scopeString)) !== -1;
+        });
       });
     });
   });
@@ -42,8 +44,10 @@ describe('protractor SearchPage', () => {
     const queryString = 'Another interesting query string';
     page.setCurrentQuery(queryString);
     page.submitSearchForm();
-    browser.getCurrentUrl().then((url: string) => {
-      expect(url.indexOf('query=' + encodeURI(queryString))).toBeGreaterThanOrEqual(0);
+    browser.wait(() => {
+      return browser.getCurrentUrl().then((url: string) => {
+        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
+      });
     });
   });
 });