Cmcmahon has submitted this change and it was merged.
Change subject: WIP VE links
......................................................................
WIP VE links
Change-Id: Ibbf9ee9653ce6cd01d4698eee19b49e17a15d108
---
A features/step_definitions/visual_editor_links_steps.rb
M features/step_definitions/visual_editor_steps.rb
M features/support/pages/visual_editor_page.rb
A features/visual_editor_links.feature
4 files changed, 47 insertions(+), 1 deletion(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/features/step_definitions/visual_editor_links_steps.rb
b/features/step_definitions/visual_editor_links_steps.rb
new file mode 100644
index 0000000..08e51f0
--- /dev/null
+++ b/features/step_definitions/visual_editor_links_steps.rb
@@ -0,0 +1,24 @@
+When(/^I click the Link button$/) do
+ on(VisualEditorPage).ve_link_icon_element.when_present.click
+end
+
+Given(/^I can see the Link User Inteface$/) do
+ on(VisualEditorPage).ve_link_ui.should match Regexp.escape('Hyperlink')
+end
+
+When(/^I click the blue text$/) do
+ on(VisualEditorPage).linksuggestion_element.when_present.click
+end
+
+When(/^I click < to close Link User Interface$/) do
+ on(VisualEditorPage).leftarrowclose
+end
+
+Then(/^an external link appears in the diff view$/) do
+ on(VisualEditorPage) do |page|
+ page.wait_until(10) do
+ page.diff_view.include? 'example.com'
+ end
+ page.diff_view.should match Regexp.escape('[http://www.example.com
Editing] ')
+ end
+end
\ No newline at end of file
diff --git a/features/step_definitions/visual_editor_steps.rb
b/features/step_definitions/visual_editor_steps.rb
index f97270a..541c40b 100644
--- a/features/step_definitions/visual_editor_steps.rb
+++ b/features/step_definitions/visual_editor_steps.rb
@@ -22,6 +22,7 @@
When(/^I click Save page$/) do
on(VisualEditorPage) do |page|
+ sleep 2 # blame Chris for this!
page.save_disabled_element.wait_while_present
page.save_page_element.when_present.click
end
diff --git a/features/support/pages/visual_editor_page.rb
b/features/support/pages/visual_editor_page.rb
index 9926c1f..8c63997 100644
--- a/features/support/pages/visual_editor_page.rb
+++ b/features/support/pages/visual_editor_page.rb
@@ -7,7 +7,6 @@
div(:container_disabled, class: 've-ui-widget ve-ui-widget-disabled
ve-ui-flaggableElement-constructive ve-ui-buttonWidget')
div(:content, class: 've-ce-documentNode ve-ce-branchNode')
text_area(:describe_change, id:
've-init-mw-viewPageTarget-saveDialog-editSummary')
- span(:diff_view, class: 'diffchange diffchange-inline')
div(:diff_view, class: 've-init-mw-viewPageTarget-saveDialog-viewer')
a(:edit_ve, text: 'Edit')
div(:insert_references, class: 've-ui-window-title')
@@ -19,8 +18,10 @@
div(:save_disabled, class: 've-ui-widget ve-ui-widget-disabled
ve-ui-flaggableElement-constructive ve-ui-buttonWidget')
span(:save_page, class: 've-ui-labeledElement-label', text: 'Save page')
span(:second_save_page, class: 've-ui-labeledElement-label', text: 'Save
page', index: 1)
+ span(:ve_link_icon, class: 've-ui-buttonTool-icon ve-ui-icon-link')
span(:ve_references, class: 've-ui-buttonTool-icon ve-ui-icon-reference')
span(:transclusion, class: 've-ui-buttonTool-icon ve-ui-icon-template')
+
in_frame(:index => 0) do |frame|
span(:add_parameter, text: 'Add parameter', frame: frame)
span(:add_template, text: 'Add template', frame: frame)
@@ -28,8 +29,11 @@
text_field(:content_box, index: 0, frame: frame)
span(:create_new, text:'Create new source', frame: frame)
div(:insert_reference, class: 've-ui-widget ve-ui-flaggableElement-primary
ve-ui-buttonWidget ve-ui-window-applyButton', frame: frame)
+ a(:leftarrowclose, class: 've-ui-widget ve-ui-iconButtonWidget
ve-ui-icon-previous ve-ui-inspector-closeButton', frame: frame)
+ span(:linksuggestion, text: 'http://www.example.com')
text_field(:parameter_box, index: 0, frame: frame)
div(:ref_body, class:'ve-ui-window-head', frame: frame)
+ div(:ve_link_ui, class: 've-ui-window-head', frame: frame)
span(:remove_parameter, text: 'Remove parameter', frame: frame)
span(:remove_template, text: 'Remove template', frame: frame)
unordered_list(:suggestion_list, class: 've-ui-widget ve-ui-selectWidget
ve-ui-menuWidget ve-ui-textInputMenuWidget ve-ui-lookupWidget-menu
ve-ui-mwTitleInputWidget-menu', frame: frame)
diff --git a/features/visual_editor_links.feature
b/features/visual_editor_links.feature
new file mode 100644
index 0000000..74a1fbc
--- /dev/null
+++ b/features/visual_editor_links.feature
@@ -0,0 +1,17 @@
[email protected] @login
+Feature: VisualEditor Links
+
+ Background:
+ Given I am logged in
+ And I am at my user page
+ When I click Edit for VisualEditor
+ And I click the Link button
+
+ Scenario: Enter external link
+ Given I can see the Link User Inteface
+ When I enter http://www.example.com into Content box
+ And I click the blue text
+ And I click < to close Link User Interface
+ And I click Save page
+ And I click Review your changes
+ Then an external link appears in the diff view
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/71724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbf9ee9653ce6cd01d4698eee19b49e17a15d108
Gerrit-PatchSet: 19
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Rachel99 <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
