From 61f8cf7ca582941477849edcc418312f30dda105 Mon Sep 17 00:00:00 2001
From: Cmcmahon <cmcmahon@wikimedia.org>
Date: Mon, 3 Nov 2014 13:56:58 -0700
Subject: [PATCH] [BrowserTest] click More button, no iframes

Change-Id: I1426f4dcfb65d6e38be5f7e495e9600f98894525
---
 .../browser/features/general_markup.feature      | 16 ++++++++++++++--
 .../step_definitions/general_markup_steps.rb     |  4 ++++
 .../features/support/pages/visual_editor_page.rb |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/ve-mw/tests/browser/features/general_markup.feature b/modules/ve-mw/tests/browser/features/general_markup.feature
index e878de7af4..6b41309d93 100644
--- a/modules/ve-mw/tests/browser/features/general_markup.feature
+++ b/modules/ve-mw/tests/browser/features/general_markup.feature
@@ -15,9 +15,21 @@ Feature: VisualEditor general text markup features
   Examples:
     | type_of_markup | expected_markup_text                          |
     | Bold           | '''General Markup VisualEditor Test'''        |
-    | Computer Code  | <code>General Markup VisualEditor Test</code> |
     | Italics        | ''General Markup VisualEditor Test''          |
+
+
+  Scenario Outline: VisualEditor more general markup
+    When I click the text style menu
+      And I click the More option
+    And I click the <type_of_markup> menu option
+    And I click Save page
+    And I click Review your changes
+    Then <expected_markup_text> should appear in the diff view
+    And I can click the X on the save box
+  Examples:
+    | type_of_markup | expected_markup_text                          |
+    | Computer Code  | <code>General Markup VisualEditor Test</code> |
     | Strikethrough  | <s>General Markup VisualEditor Test</s>       |
     | Subscript      | <sub>General Markup VisualEditor Test</sub>   |
     | Superscript    | <sup>General Markup VisualEditor Test</sup>   |
-    | Underline      | <u>General Markup VisualEditor Test</u>       |
+    | Underline      | <u>General Markup VisualEditor Test</u>       |
\ No newline at end of file
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
index f77b00a15c..872150bf80 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
@@ -1,3 +1,7 @@
+When(/^I click the More option$/) do
+  on(VisualEditorPage).ve_more_markup_options_element.when_present(15).click
+end
+
 When(/^I click the text style menu$/) do
   on(VisualEditorPage).ve_text_style_element.when_present(15).click
 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 c0612a7020..828700265c 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
@@ -69,6 +69,7 @@ class VisualEditorPage
   span(:ve_computer_code, class: "oo-ui-iconElement-icon oo-ui-icon-code")
   div(:ve_heading_menu, class: "oo-ui-iconElement-icon oo-ui-icon-down")
   span(:ve_link_icon, class: "oo-ui-iconElement-icon oo-ui-icon-link")
+  span(:ve_more_markup_options, class: "oo-ui-tool-title-text", text: "More")
   span(:ve_italics, class: "oo-ui-iconElement-icon oo-ui-icon-italic-i")
   span(:ve_media_menu, class: "oo-ui-iconElement-icon oo-ui-icon-picture")
   span(:ve_references, class: "oo-ui-iconElement-icon oo-ui-icon-references")