[MediaWiki-commits] [Gerrit] VE support on beta is now reliable, run tests there - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: VE support on beta is now reliable, run tests there
..
VE support on beta is now reliable, run tests there
Change-Id: I82e42f24a6950680770bf6fc2b11e554d95224b6
---
M
modules/ve-mw/test/browser/features/step_definitions/visual_editor_links_steps.rb
M
modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
M modules/ve-mw/test/browser/features/step_definitions/visual_editor_steps.rb
M
modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb
M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/test/browser/features/visual_editor_anon.feature
M modules/ve-mw/test/browser/features/visual_editor_headings.feature
M modules/ve-mw/test/browser/features/visual_editor_links.feature
M modules/ve-mw/test/browser/features/visual_editor_logged_in.feature
M modules/ve-mw/test/browser/features/visual_editor_references.feature
M modules/ve-mw/test/browser/features/visual_editor_transclusion.feature
11 files changed, 72 insertions(+), 56 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_links_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_links_steps.rb
index 8a2a1a2..f58a5a1 100644
---
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_links_steps.rb
+++
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_links_steps.rb
@@ -48,3 +48,10 @@
page.internal_diff_view.should match
Regexp.escape('[[DoesNotExist|Editing]]')
end
end
+
+When(/^I enter (.+) into link Content box$/) do |content|
+ on(VisualEditorPage) do |page|
+page.link_textfield_element.when_present
+page.link_textfield_element.send_keys(content)
+ end
+end
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
index 79f3a88..9379b04 100644
---
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
+++
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
@@ -3,12 +3,18 @@
end
When(/^I click Insert reference$/) do
- sleep 2 #fix for Chrome see
https://code.google.com/p/selenium/issues/detail?id=2766
- on(VisualEditorPage).create_new_element.when_present.click
+ on(VisualEditorPage).insert_reference_element.when_present.click
end
When(/^I click Edit for VisualEditor$/) do
- on(VisualEditorPage).edit_ve
+ on(VisualEditorPage) do |page|
+page.edit_ve
+#This begin/rescue clause dismisses the VE warning message when it exists,
and does not fail when it does not exist
+begin
+ page.beta_warning_element.when_present.click
+rescue
+end
+ end
end
When(/^I click Reference$/) do
@@ -19,8 +25,10 @@
end
When(/^I enter (.+) into Content box$/) do |content|
- on(VisualEditorPage).content_box_element.when_present
- on(VisualEditorPage).content_box=content
+ on(VisualEditorPage) do |page|
+page.content_box_element.when_present
+page.content_box_element.send_keys(content)
+ end
end
Then(/^I should see Insert reference button enabled$/) do
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_steps.rb
index d440205..cd5dea9 100644
---
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_steps.rb
+++
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_steps.rb
@@ -38,7 +38,13 @@
When(/^I edit the page with a string$/) do
on(VisualEditorPage) do |page|
page.edit_ve
-page.content_element.when_visible.send_keys(Editing with
#{@does_not_exist_page_name})
+#This begin/rescue clause dismisses the VE warning message when it exists,
and does not fail when it does not exist
+begin
+ page.beta_warning_element.when_present.click
+rescue
+end
+page.content_element.fire_event('onfocus')
+page.content_element.when_present.send_keys(Editing with
#{@does_not_exist_page_name})
end
end
@@ -58,7 +64,7 @@
end
When(/^I see the IP warning signs$/) do
- on(VisualEditorPage).ip_warning.should match Regexp.escape(You are not
logged in. Your IP address will be recorded in this page's edit history.)
+ on(VisualEditorPage).ip_warning.should match Regexp.escape(Your IP address)
end
Then(/^Page text should contain the string$/) do
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb
index df2dad9..1636ec3 100644
---
[MediaWiki-commits] [Gerrit] VE support on beta is now reliable, run tests there - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/83817 Change subject: VE support on beta is now reliable, run tests there .. VE support on beta is now reliable, run tests there Change-Id: I82e42f24a6950680770bf6fc2b11e554d95224b6 --- M modules/ve-mw/test/browser/features/visual_editor_anon.feature M modules/ve-mw/test/browser/features/visual_editor_headings.feature M modules/ve-mw/test/browser/features/visual_editor_links.feature M modules/ve-mw/test/browser/features/visual_editor_logged_in.feature M modules/ve-mw/test/browser/features/visual_editor_references.feature M modules/ve-mw/test/browser/features/visual_editor_transclusion.feature 6 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/17/83817/1 diff --git a/modules/ve-mw/test/browser/features/visual_editor_anon.feature b/modules/ve-mw/test/browser/features/visual_editor_anon.feature index b6d87c8..dc85eb7 100644 --- a/modules/ve-mw/test/browser/features/visual_editor_anon.feature +++ b/modules/ve-mw/test/browser/features/visual_editor_anon.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @en.wikipedia.beta.wmflabs.org Feature: VisualEditor @login diff --git a/modules/ve-mw/test/browser/features/visual_editor_headings.feature b/modules/ve-mw/test/browser/features/visual_editor_headings.feature index 1d4c41c..40f3b5f 100644 --- a/modules/ve-mw/test/browser/features/visual_editor_headings.feature +++ b/modules/ve-mw/test/browser/features/visual_editor_headings.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @login +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @en.wikipedia.beta.wmflabs.org @login Feature: VisualEditor Headings Background: Open VE and edit page with string @@ -71,4 +71,4 @@ And I click Save page And I click Review your changes Then a Page title should appear in the diff view -And I should be able to click the up arrow on the save box \ No newline at end of file +And I should be able to click the up arrow on the save box diff --git a/modules/ve-mw/test/browser/features/visual_editor_links.feature b/modules/ve-mw/test/browser/features/visual_editor_links.feature index d9de92a..656e79a 100644 --- a/modules/ve-mw/test/browser/features/visual_editor_links.feature +++ b/modules/ve-mw/test/browser/features/visual_editor_links.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @login +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login Feature: VisualEditor Links Background: diff --git a/modules/ve-mw/test/browser/features/visual_editor_logged_in.feature b/modules/ve-mw/test/browser/features/visual_editor_logged_in.feature index 7867a41..b776c4a 100644 --- a/modules/ve-mw/test/browser/features/visual_editor_logged_in.feature +++ b/modules/ve-mw/test/browser/features/visual_editor_logged_in.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @en.wikipedia.beta.wmflabs.org Feature: VisualEditor @login diff --git a/modules/ve-mw/test/browser/features/visual_editor_references.feature b/modules/ve-mw/test/browser/features/visual_editor_references.feature index ad5fc74..a404632 100644 --- a/modules/ve-mw/test/browser/features/visual_editor_references.feature +++ b/modules/ve-mw/test/browser/features/visual_editor_references.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @login +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @en.wikipedia.beta.wmflabs.org @login Feature: VisualEditor References Background: diff --git a/modules/ve-mw/test/browser/features/visual_editor_transclusion.feature b/modules/ve-mw/test/browser/features/visual_editor_transclusion.feature index be1f575..a7afcdb 100644 --- a/modules/ve-mw/test/browser/features/visual_editor_transclusion.feature +++ b/modules/ve-mw/test/browser/features/visual_editor_transclusion.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @login +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org @en.wikipedia.beta.wmflabs.org @login Feature: VisualEditor Transclusion Background: -- To view, visit https://gerrit.wikimedia.org/r/83817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82e42f24a6950680770bf6fc2b11e554d95224b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org
