From b6b93fc860a323ffec227bf2f7442971d1774f33 Mon Sep 17 00:00:00 2001 From: Cmcmahon Date: Mon, 15 Sep 2014 14:48:13 -0700 Subject: [PATCH] [BrowserTest] inadvertent clash of identifiers from earlier update Change-Id: I1a86db0f4fa9ee0f327cf371b76c9ebf25ddc17e --- .../features/step_definitions/switch_editing_mode_steps.rb | 2 +- .../tests/browser/features/support/pages/visual_editor_page.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb index d2ec825d45..a0c329cea5 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb @@ -28,7 +28,7 @@ When(/^I click Edit for VisualEditor from this page$/) do end When(/^I see the Cancel option$/) do - on(VisualEditorPage).confirm_switch_cancel_element.when_present + on(VisualEditorPage).confirm_switch_cancel_on_switch_element.when_present end When(/^I see the Discard option$/) do 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 076f6dd968..78366c10ed 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 @@ -129,6 +129,7 @@ class VisualEditorPage span(:insert_template, text: "Insert", frame: frame) span(:confirm_switch, text: "Keep changes", frame: frame) span(:confirm_switch_cancel, text: "Resume editing", frame: frame) + span(:confirm_switch_cancel_on_switch, text: "Cancel", frame: frame) span(:confirm_switch_discard, text: "Discard changes", frame: frame) div(:content_box, class: "ve-ce-documentNode ve-ce-branchNode", frame: frame) text_area(:describe_change, index: 0, frame: frame)