jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] make bullets test modern
......................................................................
[BrowserTest] make bullets test modern
* remove unnecessary wait times
* remove unnecessary sleep() statements
* remove unused steps
* update for RSpec3.0 syntax
Change-Id: Ie76135154042834e2eb8b008872aced5ac210ee5
---
M modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
2 files changed, 16 insertions(+), 37 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
index 7c2ee42..e464fc3 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
@@ -1,60 +1,44 @@
When(/^I click Bullets$/) do
on(VisualEditorPage) do |page|
- page.bullet_number_selector_element.when_present(15).click
+ page.bullet_number_selector_element.when_present.click
page.ve_bullets_element.when_present.click
end
end
When(/^I click Decrease indentation$/) do
on(VisualEditorPage) do |page|
- sleep 2 #this is waiting for the Review Your Changes iframe to disappear
step "I click in the editable part"
- page.bullet_number_selector_element.when_present(15).click
+ page.bullet_number_selector_element.when_present.click
page.decrease_indentation_element.when_present.click
end
end
When(/^I click Increase indentation$/) do
on(VisualEditorPage) do |page|
- page.bullet_number_selector_element.when_present(15).click
+ page.bullet_number_selector_element.when_present.click
page.increase_indentation_element.when_present.click
end
end
When(/^I click Numbering$/) do
on(VisualEditorPage) do |page|
- page.bullet_number_selector_element.when_present(15).click
+ page.bullet_number_selector_element.when_present.click
page.ve_numbering_element.when_present.click
- end
-end
-
-When(/^I type in an input string$/) do
- on(VisualEditorPage) do |page|
- #extra space after 'line' below is a workaround for FF issue where VE is
sending BACKSPACE before RETURN
- #probably caused by https://bugzilla.wikimedia.org/show_bug.cgi?id=56274
- page.content_element.when_present(10).send_keys "This is a new line "
- page.content_element.when_present(10).send_keys :return
end
end
When(/^I undo Bullets$/) do
on(VisualEditorPage) do |page|
- page.bullet_number_selector_element.when_present(15).click
+ page.bullet_number_selector_element.when_present.click
page.ve_bullets_element.when_present.click
end
end
When(/^I undo Numbering$/) do
on(VisualEditorPage) do |page|
- page.bullet_number_selector_element.when_present(15).click
+ page.bullet_number_selector_element.when_present.click
page.ve_numbering_element.when_present.click
end
-end
-
-When(/^select the string$/) do
- require "watir-webdriver/extensions/select_text"
- on(VisualEditorPage).content_element.select_text "This is a new line"
- sleep 1 # turn the sleep on if this test fails with bullet/number in front
of string NOT "This is.."
end
Then(/^a \# is added in front of input string in the diff view$/) do
@@ -62,7 +46,7 @@
page.wait_until(10) do
page.diff_view.include? "# #{@wikitext}"
end
- page.diff_view.should match Regexp.new(/^\# #{@wikitext}/)
+ expect(page.diff_view).to match /^\# #{@wikitext}/
end
end
@@ -71,7 +55,7 @@
page.wait_until(10) do
page.diff_view.include? "* #{@wikitext}"
end
- page.diff_view.should match Regexp.new(/^\* #{@wikitext}/)
+ expect(page.diff_view).to match /^\* #{@wikitext}/
end
end
@@ -80,7 +64,7 @@
page.wait_until(10) do
page.diff_view.include? "## #{@wikitext}"
end
- page.diff_view.should match Regexp.new(/^\#\# #{@wikitext}/)
+ expect(page.diff_view).to match /^\#\# #{@wikitext}/
end
end
@@ -89,31 +73,26 @@
page.wait_until(10) do
page.diff_view.include? "** #{@wikitext}"
end
- page.diff_view.should match Regexp.new(/^\*\* #{@wikitext}/)
+ expect(page.diff_view).to match /^\*\* #{@wikitext}/
end
end
Then(/^Decrease indentation should be enabled$/) do
- on(VisualEditorPage).decrease_indentation_element.class_name.should_not
match /disabled/
+ expect(on(VisualEditorPage).decrease_indentation_element.class_name).not_to
match /disabled/
end
Then(/^Decrease indentation should be disabled$/) do
- on(VisualEditorPage).decrease_indentation_element.should_not be_visible
+ expect(on(VisualEditorPage).decrease_indentation_element).not_to be_visible
end
Then(/^Increase indentation should be enabled$/) do
- on(VisualEditorPage).increase_indentation_element.class_name.should_not
match /disabled/
+ expect(on(VisualEditorPage).increase_indentation_element.class_name).not_to
match /disabled/
end
Then(/^Increase indentation should be disabled$/) do
- on(VisualEditorPage).increase_indentation_element.should_not be_visible
+ expect(on(VisualEditorPage).increase_indentation_element).to_not be_visible
end
Then(/^nothing is added in front of input string in the diff view$/) do
- on(VisualEditorPage) do |page|
- page.wait_until(10) do
- page.review_failed_element.when_present.text.include? "No changes to
review"
- end
- page.review_failed_element.when_present.text.should match "No changes to
review"
- end
+ expect(on(VisualEditorPage).review_failed_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 7e57465..8909849 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
@@ -146,7 +146,7 @@
div(:parameter_icon, text: "q")
a(:remove_parameter, css: ".ve-ui-mwParameterPage-removeButton >
a:nth-child(1)")
- div(:review_failed, class: "oo-ui-window-head")
+ span(:review_failed, text: "No changes to review")
span(:confirm_switch_cancel_on_switch, text: "Cancel")
span(:confirm_switch_discard, text: "Discard changes")
--
To view, visit https://gerrit.wikimedia.org/r/172761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie76135154042834e2eb8b008872aced5ac210ee5
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Ryasmeen <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
