From 2449ebde99da40e1ddad5ef028c100cca6f62772 Mon Sep 17 00:00:00 2001 From: Cmcmahon Date: Fri, 21 Nov 2014 13:24:29 -0700 Subject: [PATCH] [BrowserTest] consolidate some duplicate elements and remove one unused Change-Id: Ica50cf74edd9a21423800a7d58f4832b77a7e8bc --- .../browser/features/step_definitions/references_steps.rb | 2 +- .../browser/features/step_definitions/transclusion_steps.rb | 2 +- .../browser/features/support/pages/visual_editor_page.rb | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb index 8620237eb3..1997dd13e0 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb @@ -13,7 +13,7 @@ Given(/^I can see the References User Interface$/) do end When(/^I click Insert references list$/) do - on(VisualEditorPage).insert_references_list_element.when_present.click + on(VisualEditorPage).insert_element.when_present.click end When(/^I click Reference$/) do diff --git a/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb index 712924d46a..fd79bd141f 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb @@ -49,5 +49,5 @@ Then(/^I should see a list of template suggestions$/) do end Then(/^I should see the Insert template button$/) do - expect(on(VisualEditorPage).insert_template_element.when_present).to be_visible + expect(on(VisualEditorPage).insert_element.when_present).to be_visible end diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb index b0b2b97976..161f3ccfe7 100644 --- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb @@ -63,8 +63,7 @@ class VisualEditorPage span(:insert_menu, class: 'oo-ui-popupToolGroup-handle', index: 5) div(:insert_pull_down, class: 'oo-ui-toolGroup-tools oo-ui-clippableElement-clippable', index: 5) div(:insert_references, class: 'oo-ui-processDialog-location') - span(:insert_references_list, text: 'Insert') - span(:insert_template, text: 'Insert') + span(:insert, text: 'Insert') a(:internal_link, class: 've-ce-linkAnnotation ve-ce-mwInternalLinkAnnotation') div(:ip_warning, class: 've-ui-mwNoticesPopupTool-item', text: /Your IP address/) div(:language_notification, class: 'tipsy-inner') @@ -73,7 +72,6 @@ class VisualEditorPage div(:link_overlay_does_not_exist, text: /New page/) div(:link_overlay_external_link, text: /External link.+New page/m) div(:link_overlay_wiki_page, text: /Matching page/) - span(:media_apply_changes, text: 'Insert') unordered_list(:media_caption, class: 've-ui-contextMenuWidget') span(:media_exit, text: 'Return to save form') figure(:media_image, index: 0)