From 00e31c13f516206ff979cc0798d2dd69f044495c Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 20 Dec 2017 00:40:42 -0500 Subject: [PATCH] Fix more selenium library tests. --- .../galaxy/scripts/mvc/collection/list-collection-creator.js | 4 ++-- test/galaxy_selenium/navigates_galaxy.py | 3 +-- test/galaxy_selenium/navigation.yml | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/galaxy/scripts/mvc/collection/list-collection-creator.js b/client/galaxy/scripts/mvc/collection/list-collection-creator.js index 2d05bbefd32..5a0072d0503 100644 --- a/client/galaxy/scripts/mvc/collection/list-collection-creator.js +++ b/client/galaxy/scripts/mvc/collection/list-collection-creator.js @@ -278,8 +278,8 @@ var ListCollectionCreator = Backbone.View.extend(BASE_MVC.LoggableMixin) /** describe what is wrong with a particular element if anything */ _isElementInvalid: function(element) { - if (element.history_content_type !== "dataset" && element.type !== "file") { - return _l("is not a dataset or a library file"); + if (element.history_content_type === "dataset_collection") { + return _l("is a collection, this is not allowed"); } var validState = element.state === STATES.OK || _.contains(STATES.NOT_READY_STATES, element.state); if (!validState) { diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py index 0ddfc8ad4cf..03727b15221 100644 --- a/test/galaxy_selenium/navigates_galaxy.py +++ b/test/galaxy_selenium/navigates_galaxy.py @@ -662,8 +662,7 @@ class NavigatesGalaxy(HasDriver): self.driver.execute_script("$(arguments[0]).keyup();", search_box) def libraries_folder_create(self, name): - create_folder_button = self.wait_for_selector_clickable("#toolbtn_create_folder") - create_folder_button.click() + self.components.libraries.folder.add_folder.wait_for_and_click() name_text_box = self.wait_for_selector_clickable("input[name='Name']") name_text_box.send_keys(name) diff --git a/test/galaxy_selenium/navigation.yml b/test/galaxy_selenium/navigation.yml index 22b6979bc70..7d7aa41a676 100644 --- a/test/galaxy_selenium/navigation.yml +++ b/test/galaxy_selenium/navigation.yml @@ -240,6 +240,8 @@ libraries: add_items_menu: '.add-library-items-datasets .dropdown-menu' add_items_options: '.add-library-items-datasets .dropdown-menu li a' + add_folder: '.add-library-items-folder' + add_to_history: '.add-to-history' add_to_history_datasets: '.add-to-history-datasets' add_to_history_collection: '.add-to-history-collection'