From fefd6f45aff476cf547cbde412985cab462c6ecf Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 13 Feb 2019 08:43:09 +0100 Subject: [PATCH 1/2] removed deprecation --- front/core/lib/module-loader.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/front/core/lib/module-loader.js b/front/core/lib/module-loader.js index fa8876520f..477b1c943a 100644 --- a/front/core/lib/module-loader.js +++ b/front/core/lib/module-loader.js @@ -20,8 +20,6 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t return loaded[moduleName]; if (loaded[moduleName] === false) return Promise.resolve(true); - // TODO task #1134 look for a better way to handle dependency loop - // return $q.reject(new Error(`Module dependency loop detected: ${moduleName}`)); loaded[moduleName] = false; From 3bd137a43523c003176395b0ae512b3276498510 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 13 Feb 2019 08:53:57 +0100 Subject: [PATCH 2/2] minor refactor --- e2e/helpers/extensions.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js index 27590c4eab..e311df4329 100644 --- a/e2e/helpers/extensions.js +++ b/e2e/helpers/extensions.js @@ -266,11 +266,11 @@ let actions = { }); }, - waitForTextInElement: function(selector, name, done) { + waitForTextInElement: function(selector, text, done) { this.wait(selector) - .wait((selector, name) => { - return document.querySelector(selector).innerText.toLowerCase().includes(name.toLowerCase()); - }, selector, name) + .wait((selector, text) => { + return document.querySelector(selector).innerText.toLowerCase().includes(text.toLowerCase()); + }, selector, text) .then(done) .catch(done); },