From 9b05d3bc50650d6a86d4241dfc3c4104d25d6884 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Tue, 2 May 2017 16:01:45 +0100 Subject: [PATCH 01/12] Fix search form behavior --- .../js/home/views/application_list_view.js | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index a35aa9fa7..be9c8a007 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -8,14 +8,8 @@ define([
-
-
- - - - -
+ +
@@ -37,6 +31,7 @@ define([
  • @@ -58,7 +53,23 @@ define([
    • - ` + `, + + data: function() { + return { 'search_input': '' } + }, + + computed: { + 'entries_visible': function() { + return this.search_input === '' ? + new Array(this.model.app_list.length).fill(true) : + this.model.app_list.map(function(app) { + var image = app.app_data.image; + var name = image.ui_name? image.ui_name: image.name; + return name.toLowerCase().includes(this.search_input.toLowerCase()); + }.bind(this)); + } + } }); return { From c976fa91f0281504128a8302fa17750880f1c06c Mon Sep 17 00:00:00 2001 From: martinRenou Date: Tue, 2 May 2017 16:14:42 +0100 Subject: [PATCH 02/12] Deselect current selected application if it's not displayed in the list --- .../static/js/home/views/application_list_view.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index be9c8a007..6f4e62337 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -56,18 +56,24 @@ define([ `, data: function() { - return { 'search_input': '' } + return { 'search_input': '' }; }, computed: { 'entries_visible': function() { - return this.search_input === '' ? - new Array(this.model.app_list.length).fill(true) : + var entries_visible = this.search_input === ''? + new Array(this.model.app_list.length).fill(true): this.model.app_list.map(function(app) { var image = app.app_data.image; var name = image.ui_name? image.ui_name: image.name; return name.toLowerCase().includes(this.search_input.toLowerCase()); }.bind(this)); + + // Deselect current selected application if it's not in the list anymore + this.model.selected_index = entries_visible[this.model.selected_index]? + this.model.selected_index: + null; + return entries_visible; } } }); From 3852b867e9d090384ae0287d158ee889eda951dd Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 3 May 2017 11:38:56 +0100 Subject: [PATCH 03/12] Undo commit c976fa9 --- .../static/js/home/views/application_list_view.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index 485f895c9..eea4e1468 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -59,19 +59,13 @@ define([ computed: { 'entries_visible': function() { - var entries_visible = this.search_input === ''? + return this.search_input === ''? new Array(this.model.app_list.length).fill(true): this.model.app_list.map(function(app) { var image = app.app_data.image; var name = image.ui_name? image.ui_name: image.name; return name.toLowerCase().includes(this.search_input.toLowerCase()); }.bind(this)); - - // Deselect current selected application if it's not in the list anymore - this.model.selected_index = entries_visible[this.model.selected_index]? - this.model.selected_index: - null; - return entries_visible; } } }); From 0608ad5112fcaf963df2aeb1c3f23a47fb47a67a Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 11:39:46 +0100 Subject: [PATCH 04/12] No need for a method or a variable entries_visible --- .../static/js/home/views/application_list_view.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index eea4e1468..e174de6e9 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -30,7 +30,7 @@ define([ ' ' + '
  • ' + ' ' + @@ -55,18 +55,6 @@ define([ data: function() { return { 'search_input': '' }; - }, - - computed: { - 'entries_visible': function() { - return this.search_input === ''? - new Array(this.model.app_list.length).fill(true): - this.model.app_list.map(function(app) { - var image = app.app_data.image; - var name = image.ui_name? image.ui_name: image.name; - return name.toLowerCase().includes(this.search_input.toLowerCase()); - }.bind(this)); - } } }); From c0a56451b925945ab3127b5fb777f46847fd7ce4 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 12:00:28 +0100 Subject: [PATCH 05/12] Add selenium test for hiding application --- .../js/home/views/application_list_view.js | 2 +- selenium_tests/test_hide_application.py | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 selenium_tests/test_hide_application.py diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index e174de6e9..a6323844a 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -8,7 +8,7 @@ define([ '
    ' + '' + '
    ' + - ' ' + + ' ' + '
    ' + '' + diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py new file mode 100644 index 000000000..bf7b97e72 --- /dev/null +++ b/selenium_tests/test_hide_application.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from selenium_tests.selenium_test_base import SeleniumTestBase + + +class TestHideApplication(SeleniumTestBase): + def test_hide_application(self): + driver = self.driver + with self.login(): + self.wait_for( + lambda: + driver.find_element_by_css_selector( + "#applistentries > li > a > span").text != "Loading") + + app_entry = driver.find_element_by_css_selector( + "#applistentries > li > a > img") + + # Click on the search box + search_box = driver.find_element_by_id("search-box") + search_box.send_keys('foo bar') + + self.wait_for(lambda: + app_entry.value_of_css_property('display') == "none") From 6dc6179145344a46938044bb1f42dae16e8915e6 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 12:27:16 +0100 Subject: [PATCH 06/12] Try to fix selenium test --- selenium_tests/test_hide_application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py index bf7b97e72..dfc1877c1 100644 --- a/selenium_tests/test_hide_application.py +++ b/selenium_tests/test_hide_application.py @@ -12,7 +12,7 @@ def test_hide_application(self): "#applistentries > li > a > span").text != "Loading") app_entry = driver.find_element_by_css_selector( - "#applistentries > li > a > img") + "#applistentries > li") # Click on the search box search_box = driver.find_element_by_id("search-box") From d59291ca7ce85a1dc12da796edacaf683c12ec96 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 12:41:36 +0100 Subject: [PATCH 07/12] Try to fix selenium test 2 --- selenium_tests/test_hide_application.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py index dfc1877c1..1cff235e7 100644 --- a/selenium_tests/test_hide_application.py +++ b/selenium_tests/test_hide_application.py @@ -18,5 +18,6 @@ def test_hide_application(self): search_box = driver.find_element_by_id("search-box") search_box.send_keys('foo bar') - self.wait_for(lambda: - app_entry.value_of_css_property('display') == "none") + self.wait_for( + lambda: + app_entry[0].value_of_css_property('display') == "none") From d85556e232c412059d8c93b8143848b589a2ab97 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 12:47:14 +0100 Subject: [PATCH 08/12] Try to fix selenium test 3 --- selenium_tests/test_hide_application.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py index 1cff235e7..9cc365b1b 100644 --- a/selenium_tests/test_hide_application.py +++ b/selenium_tests/test_hide_application.py @@ -11,13 +11,12 @@ def test_hide_application(self): driver.find_element_by_css_selector( "#applistentries > li > a > span").text != "Loading") - app_entry = driver.find_element_by_css_selector( - "#applistentries > li") - # Click on the search box search_box = driver.find_element_by_id("search-box") - search_box.send_keys('foo bar') + search_box.send_keys('foo bar heho') self.wait_for( lambda: - app_entry[0].value_of_css_property('display') == "none") + driver.find_element_by_css_selector( + "#applistentries > li").value_of_css_property( + 'display') == "none") From 36395a5f301edfb785be60a384e4fb63570ec89c Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 13:11:12 +0100 Subject: [PATCH 09/12] Try to fix selenium test 4 --- .../static/js/home/views/application_list_view.js | 2 +- selenium_tests/test_hide_application.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index a6323844a..e174de6e9 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -8,7 +8,7 @@ define([ '
    ' + '' + '
    ' + - ' ' + + ' ' + '
    ' + '' + diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py index 9cc365b1b..47e20ed1b 100644 --- a/selenium_tests/test_hide_application.py +++ b/selenium_tests/test_hide_application.py @@ -12,8 +12,9 @@ def test_hide_application(self): "#applistentries > li > a > span").text != "Loading") # Click on the search box - search_box = driver.find_element_by_id("search-box") - search_box.send_keys('foo bar heho') + search_box = driver.find_element_by_name("q") + search_box.clear() + search_box.send_keys('foobarheho') self.wait_for( lambda: From 2acf15656640034856bab57e1dbe083fa9ab577c Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 13:21:58 +0100 Subject: [PATCH 10/12] Add print for debug --- selenium_tests/test_hide_application.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py index 47e20ed1b..cef795d2b 100644 --- a/selenium_tests/test_hide_application.py +++ b/selenium_tests/test_hide_application.py @@ -15,7 +15,8 @@ def test_hide_application(self): search_box = driver.find_element_by_name("q") search_box.clear() search_box.send_keys('foobarheho') - + print(driver.find_element_by_css_selector( + "#applistentries > li")) self.wait_for( lambda: driver.find_element_by_css_selector( From 2bc0f3fc1a3b316d151953a5954a7f073618dfe3 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 4 May 2017 13:47:52 +0100 Subject: [PATCH 11/12] Try to fix selenium test n --- .../static/js/home/views/application_list_view.js | 4 +++- selenium_tests/test_hide_application.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index e174de6e9..3248f63d8 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -12,9 +12,11 @@ define([ '' + '' + - '