jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342199 )
Change subject: Add browser test for the auto scroll
......................................................................
Add browser test for the auto scroll
Bug: T159522
Change-Id: Ic1f5a862389a521ec6c5d4125f487d546d32f658
---
A tests/browser/features/autoscroll.feature
M tests/browser/features/support/step_definitions/edit_conflict_steps.rb
M tests/browser/features/support/step_definitions/edit_steps.rb
3 files changed, 39 insertions(+), 0 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/autoscroll.feature
b/tests/browser/features/autoscroll.feature
new file mode 100644
index 0000000..8418b9f
--- /dev/null
+++ b/tests/browser/features/autoscroll.feature
@@ -0,0 +1,16 @@
+@chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
+Feature: Two column edit conflict screen
+ Background:
+ Given I am logged in
+ And I have reset my preferences
+ And TwoColConflict is enabled as a beta feature
+
+ Scenario: Basic two-column edit conflict page is shown correctly
+ When I go to the "TwoColConflict Test Page" page with many lines
+ And I click Edit
+ And Another user changes some of the many lines of the "TwoColConflict
Test Page" page
+ And I edit the page with "ChangeB"
+ And I save the edit
+ Then The two column edit conflict screen should be shown
+ And The editor view should be scrolled
+ And The diff view should be scrolled
diff --git
a/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
b/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
index b65a22e..fa89988 100644
--- a/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
+++ b/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
@@ -116,3 +116,11 @@
Then(/^The show unchanged text option should be selected$/) do
expect(on(EditConflictPage).twocolconflict_option_show_selected?).to
be_truthy
end
+
+Then(/^The editor view should be scrolled$/) do
+ browser.execute_script('$( ".mw-twocolconflict-editor-col textarea"
).scrollTop() > 0;')
+end
+
+Then(/^The diff view should be scrolled$/) do
+ browser.execute_script('$( ".mw-twocolconflict-changes-editor" ).scrollTop()
> 0;')
+end
diff --git a/tests/browser/features/support/step_definitions/edit_steps.rb
b/tests/browser/features/support/step_definitions/edit_steps.rb
index f0a928c..3a2ed01 100644
--- a/tests/browser/features/support/step_definitions/edit_steps.rb
+++ b/tests/browser/features/support/step_definitions/edit_steps.rb
@@ -13,6 +13,11 @@
step "I am on the #{page_title} page"
end
+Given(/^I go to the "(.+)" page with many lines$/) do |page_title|
+ api.create_page page_title,
"Line1\n\n\n\nLine3\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nLastLine"
+ step "I am on the #{page_title} page"
+end
+
When(/^Another user changes the multi line content of the "(.+?)" page$/) do
|page_title|
as_user(:conflicting_user) do
api.edit(
@@ -22,3 +27,13 @@
)
end
end
+
+When(/^Another user changes some of the many lines of the "(.+?)" page$/) do
|page_title|
+ as_user(:conflicting_user) do
+ api.edit(
+ title: page_title,
+ text:
"Line1\n\n\n\nLine3A\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nLastLineChangeA",
+ summary: 'Conflicting edit'
+ )
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/342199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1f5a862389a521ec6c5d4125f487d546d32f658
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
