Spage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131026
Change subject: Update Headers browser test
......................................................................
Update Headers browser test
* Create new Flow page in User_talk namespace, more likely to be in
$wgFlowOccupyNamespaces
* Merge "I should see the edit header form" scenario into "Edit header
on a new board" scenario
* Update selectors since edit header now reuses general edit form.
* Tweak feature annotations.
Change-Id: I90cb68faf890de572001e4c3b77b829d2faf258b
---
M tests/browser/features/header.feature
M tests/browser/features/step_definitions/header_steps.rb
M tests/browser/features/support/pages/flow_page.rb
M tests/browser/features/support/pages/new_flow_page.rb
4 files changed, 11 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/26/131026/1
diff --git a/tests/browser/features/header.feature
b/tests/browser/features/header.feature
index 6cd9cde..93aa883 100644
--- a/tests/browser/features/header.feature
+++ b/tests/browser/features/header.feature
@@ -1,5 +1,7 @@
-@chrome @ee-prototype.wmflabs.org @firefox @internet_explorer_10 @login @wip
+@chrome @firefox @internet_explorer_10 @login
Feature: Headers
+
+ Assumes Flow is enabled for the User_talk namespace.
Background:
Given I am logged in
@@ -8,14 +10,10 @@
Given I am on a new board
Then The header should say "This talk page currently has no header"
- Scenario: Edit header form on a new board
- Given I am on a new board
- When I click the edit header link
- Then I should see the edit header form
-
Scenario: Edit header on a new board
Given I am on a new board
When I click the edit header link
+ And I see the edit header form
And I type "test12345" into the header textbox
And I click Save
Then The header should say "test12345"
diff --git a/tests/browser/features/step_definitions/header_steps.rb
b/tests/browser/features/step_definitions/header_steps.rb
index 522dc29..1210550 100644
--- a/tests/browser/features/step_definitions/header_steps.rb
+++ b/tests/browser/features/step_definitions/header_steps.rb
@@ -12,7 +12,7 @@
end
end
-Then(/^I should see the edit header form$/) do
+Then(/^I see the edit header form$/) do
on(FlowPage).edit_header_form_element.when_visible.should be_visible
end
@@ -22,4 +22,4 @@
When(/^I click Save$/) do
on(FlowPage).edit_header_save_element.when_present.click
-end
\ No newline at end of file
+end
diff --git a/tests/browser/features/support/pages/flow_page.rb
b/tests/browser/features/support/pages/flow_page.rb
index 41a81a1..f68087e 100644
--- a/tests/browser/features/support/pages/flow_page.rb
+++ b/tests/browser/features/support/pages/flow_page.rb
@@ -62,7 +62,7 @@
div(:header_content, id: "flow-header-content", index: 0)
a(:edit_header_link, title: "Edit header")
- form(:edit_header_form, class: "flow-edit-header-form")
- text_field(:edit_header_textbox, class: "flow-edit-header-content")
- button(:edit_header_save, class: "flow-edit-header-submit")
+ form(:edit_header_form, class: "flow-edit-form") # Reuses common edit action
so no header-specific class.
+ text_field(:edit_header_textbox, class: "flow-edit-content") # Reuses common
edit action so no header-specific class.
+ button(:edit_header_save, text: "Save header")
end
diff --git a/tests/browser/features/support/pages/new_flow_page.rb
b/tests/browser/features/support/pages/new_flow_page.rb
index b9778f5..1483a74 100644
--- a/tests/browser/features/support/pages/new_flow_page.rb
+++ b/tests/browser/features/support/pages/new_flow_page.rb
@@ -3,6 +3,6 @@
class NewFlowPage < FlowPage
include URL
- # MEDIAWIKI_URL must have this in $wgFlowOccupyPages array or
$wgFlowOccupyNamespaces.
- page_url URL.url("Talk:New page " + Array.new(8){[*'0'..'9', *'a'..'z',
*'A'..'Z'].sample}.join )
+ # MEDIAWIKI_URL must have User_talk in $wgFlowOccupyNamespaces.
+ page_url URL.url("User_talk:New page " + Array.new(8){[*'0'..'9', *'a'..'z',
*'A'..'Z'].sample}.join )
end
--
To view, visit https://gerrit.wikimedia.org/r/131026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90cb68faf890de572001e4c3b77b829d2faf258b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
