Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322890
Change subject: Extend browsertests to test new conflict-view
......................................................................
Extend browsertests to test new conflict-view
Bug: T149720
Change-Id: I86b4b3f397af22658da4577915f9c434ba011167
---
M tests/browser/features/edit_conflict.feature
M tests/browser/features/support/pages/edit_conflict_page.rb
M tests/browser/features/support/step_definitions/edit_conflict_steps.rb
3 files changed, 56 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/90/322890/1
diff --git a/tests/browser/features/edit_conflict.feature
b/tests/browser/features/edit_conflict.feature
index 0aa3d46..83d9ccc 100644
--- a/tests/browser/features/edit_conflict.feature
+++ b/tests/browser/features/edit_conflict.feature
@@ -8,4 +8,7 @@
And I save the edit
Then The two column edit conflict screen should be shown
And The editor should contain "I am a longer sentence than before."
- And The changes textbox should contain "Adding some random content."
+ And Changes should be shown as split into foreign and own
+ And Section for common changes should not be there
+ And Own changes section should contain "Adding some random content."
+ And Foreign changes section should contain "I am a longer sentence than
before."
diff --git a/tests/browser/features/support/pages/edit_conflict_page.rb
b/tests/browser/features/support/pages/edit_conflict_page.rb
index bbeb44a..e64f140 100644
--- a/tests/browser/features/support/pages/edit_conflict_page.rb
+++ b/tests/browser/features/support/pages/edit_conflict_page.rb
@@ -6,4 +6,9 @@
div(:twocolconflict_changes_text, id: 'mw-twocolconflict-changes-editor')
div(:twocolconflict_editor_desc, css: '.mw-twocolconflict-editor-col
.mw-twocolconflict-col-desc')
text_area(:twocolconflict_editor_text, css: '.mw-twocolconflict-editor-col
textarea')
+ div(:twocolconflict_changes_same, css: '#mw-twocolconflict-changes-editor
.mw-twocolconflict-diffchange-same')
+ div(:twocolconflict_changes_foreign, css: '#mw-twocolconflict-changes-editor
.mw-twocolconflict-diffchange-foreign')
+ div(:twocolconflict_changes_own, css: '#mw-twocolconflict-changes-editor
.mw-twocolconflict-diffchange-own')
+ div(:twocolconflict_changes_title_foreign, css:
'#mw-twocolconflict-changes-editor .mw-twocolconflict-diffchange-foreign
.mw-twocolconflict-diffchange-title')
+ div(:twocolconflict_changes_title_own, css:
'#mw-twocolconflict-changes-editor .mw-twocolconflict-diffchange-own
.mw-twocolconflict-diffchange-title')
end
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 3fbc7cf..2ce61eb 100644
--- a/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
+++ b/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
@@ -2,8 +2,15 @@
step 'An explanation header should be shown'
step 'A description for the changes column should be shown'
step 'A description for the editor column should be shown'
- step 'A textbox with changes from the user should be shown'
+ step 'A textbox with conflicting changes should be shown'
step 'A textbox for the editor should be shown'
+end
+
+Then(/^Changes should be shown as split into foreign and own$/) do
+ step 'Foreign version title should be there'
+ step 'Own version title should be there'
+ step 'Section for foreign changes should be there'
+ step 'Section for own changes should be there'
end
Then(/^An explanation header should be shown$/) do
@@ -18,7 +25,7 @@
expect(on(EditConflictPage).twocolconflict_editor_desc_element).to be_visible
end
-Then(/^A textbox with changes from the user should be shown$/) do
+Then(/^A textbox with conflicting changes should be shown$/) do
expect(on(EditConflictPage).twocolconflict_changes_text_element).to
be_visible
end
@@ -30,6 +37,42 @@
expect(on(EditConflictPage).twocolconflict_editor_text_element.text).to
match(text)
end
-Then(/^The changes textbox should contain "(.+?)"$/) do |text|
- expect(on(EditConflictPage).twocolconflict_changes_text_element.text).to
match(text + @random_string)
+Then(/^Own changes section should contain "(.+?)"$/) do |text|
+ expect(on(EditConflictPage).twocolconflict_changes_own_element.text).to
match(text + @random_string)
+end
+
+Then(/^Foreign changes section should contain "(.+?)"$/) do |text|
+ expect(on(EditConflictPage).twocolconflict_changes_foreign_element.text).to
match(text)
+end
+
+Then(/^Section for common changes should be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_same_element).to
be_visible
+end
+
+Then(/^Section for foreign changes should be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_foreign_element).to
be_visible
+end
+
+Then(/^Section for own changes should be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_own_element).to be_visible
+end
+
+Then(/^Section for common changes should not be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_same_element).not_to
be_visible
+end
+
+Then(/^Section for foreign changes should not be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_foreign_element).not_to
be_visible
+end
+
+Then(/^Section for own changes should not be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_own_element).not_to
be_visible
+end
+
+Then(/^Foreign version title should be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_title_foreign_element).to
be_visible
+end
+
+Then(/^Own version title should be there$/) do
+ expect(on(EditConflictPage).twocolconflict_changes_title_own_element).to
be_visible
end
--
To view, visit https://gerrit.wikimedia.org/r/322890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86b4b3f397af22658da4577915f9c434ba011167
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
