[MediaWiki-commits] [Gerrit] Browser tests for mark as resolved and reopen - change (mediawiki...Flow)

2015-06-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Browser tests for mark as resolved and reopen
..


Browser tests for mark as resolved and reopen

* Also removed tests for lock/unlock

Bug: T102842
Change-Id: Ibb376845714ea7e19e4b55fc6b45df4d66172dbe
---
D tests/browser/features/lock_unlock_topics.feature
A tests/browser/features/mark_topic_as_resolved.feature
A tests/browser/features/reopen_topic.feature
D tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
A tests/browser/features/step_definitions/resolve_reopen_steps.rb
M tests/browser/features/support/pages/flow_page.rb
6 files changed, 166 insertions(+), 138 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/lock_unlock_topics.feature 
b/tests/browser/features/lock_unlock_topics.feature
deleted file mode 100644
index 83ab1a4..000
--- a/tests/browser/features/lock_unlock_topics.feature
+++ /dev/null
@@ -1,48 +0,0 @@
-@chrome @clean @ee-prototype.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@firefox @login @test2.wikipedia.org
-Feature: Lock and unlock topics
-
-  Background:
-  Given I am logged in
-
-  @wip
-  Scenario: Locked topics have no reply links
-Given I am on Flow page
-And I have created a Flow topic
-And the top post has been locked
-When I expand the top post
-Then the original message for the top post should have no reply link
-And the original message for the top post should have no edit link
-
-  @internet_explorer_10
-  Scenario: Locking a topic and then changing your mind
-Given I am on Flow page
-And I have created a Flow topic
-When I hover on the Topic Actions link
-And I click the Lock topic button
-And I cancel the lock/unlock topic form
-Then the top post should be an open discussion
-And I should not see the lock/unlock form
-
-  @internet_explorer_10
-  Scenario: Locking a topic
-Given I am on Flow page
-And I have created a Flow topic
-When I hover on the Topic Actions link
-And I click the Lock topic button
-And I type This is a bikeshed as the reason
-And I submit the lock/unlock topic form
-Then the top post should be a locked discussion
-And the reason of the first topic should be This is a bikeshed
-And the content of the top post should be visible
-
-  # Close-then-unlock doesn't work in IE, it caches the API response (bug 
69160).
-  Scenario: Opening a topic
-Given I am on Flow page
-And I have created a Flow topic
-And the top post has been locked
-And I hover on the Topic Actions link
-And I click the Unlock topic button
-When I type Fun discussion as the reason
-And I submit the lock/unlock topic form
-Then the top post should be an open discussion
-And the content of the top post should be visible
diff --git a/tests/browser/features/mark_topic_as_resolved.feature 
b/tests/browser/features/mark_topic_as_resolved.feature
new file mode 100644
index 000..a040b12
--- /dev/null
+++ b/tests/browser/features/mark_topic_as_resolved.feature
@@ -0,0 +1,29 @@
+@chrome @internet_explorer_10 @firefox @login @clean 
@en.wikipedia.beta.wmflabs.org
+Feature: Mark topic as resolved
+
+  Background:
+Given I am logged in
+And I am on Flow page
+And I have created a Flow topic
+
+  Scenario: Resolving a topic without a summary
+When I mark the first topic as resolved
+And I skip the summary
+Then the first topic is resolved
+
+  Scenario: Resolving a topic and adding a summary
+When I mark the first topic as resolved
+And I summarize as the answer is 42
+Then the first topic is resolved with summary the answer is 42
+
+  Scenario: Resolving a topic and keeping the summary
+Given I summarize the first topic as this answer should be kept
+When I mark the first topic as resolved
+And I keep the summary
+Then the first topic is resolved with summary this answer should be kept
+
+  Scenario: Resolving a topic and updating the summary
+Given I summarize the first topic as this answer should be changed
+When I mark the first topic as resolved
+And I summarize as this is the new answer
+Then the first topic is resolved with summary this is the new answer
diff --git a/tests/browser/features/reopen_topic.feature 
b/tests/browser/features/reopen_topic.feature
new file mode 100644
index 000..e8aa645
--- /dev/null
+++ b/tests/browser/features/reopen_topic.feature
@@ -0,0 +1,15 @@
+@chrome @internet_explorer_10 @firefox @login @clean 
@en.wikipedia.beta.wmflabs.org
+Feature: Reopen a resolved topic
+
+  Background:
+Given I am logged in
+And I am on Flow page
+And I have created a Flow topic
+
+  Scenario: Reopening a resolved topic and changing the summary
+Given 

[MediaWiki-commits] [Gerrit] Browser tests for mark as resolved and reopen - change (mediawiki...Flow)

2015-06-19 Thread Sbisson (Code Review)
Sbisson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219466

Change subject: Browser tests for mark as resolved and reopen
..

Browser tests for mark as resolved and reopen

* Also removed tests for lock/unlock

Bug: T102842
Change-Id: Ibb376845714ea7e19e4b55fc6b45df4d66172dbe
---
D tests/browser/features/lock_unlock_topics.feature
A tests/browser/features/mark_topic_as_resolved.feature
A tests/browser/features/reopen_topic.feature
D tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
A tests/browser/features/step_definitions/resolve_reopen_steps.rb
M tests/browser/features/support/pages/flow_page.rb
6 files changed, 155 insertions(+), 139 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/66/219466/1

diff --git a/tests/browser/features/lock_unlock_topics.feature 
b/tests/browser/features/lock_unlock_topics.feature
deleted file mode 100644
index 83ab1a4..000
--- a/tests/browser/features/lock_unlock_topics.feature
+++ /dev/null
@@ -1,48 +0,0 @@
-@chrome @clean @ee-prototype.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@firefox @login @test2.wikipedia.org
-Feature: Lock and unlock topics
-
-  Background:
-  Given I am logged in
-
-  @wip
-  Scenario: Locked topics have no reply links
-Given I am on Flow page
-And I have created a Flow topic
-And the top post has been locked
-When I expand the top post
-Then the original message for the top post should have no reply link
-And the original message for the top post should have no edit link
-
-  @internet_explorer_10
-  Scenario: Locking a topic and then changing your mind
-Given I am on Flow page
-And I have created a Flow topic
-When I hover on the Topic Actions link
-And I click the Lock topic button
-And I cancel the lock/unlock topic form
-Then the top post should be an open discussion
-And I should not see the lock/unlock form
-
-  @internet_explorer_10
-  Scenario: Locking a topic
-Given I am on Flow page
-And I have created a Flow topic
-When I hover on the Topic Actions link
-And I click the Lock topic button
-And I type This is a bikeshed as the reason
-And I submit the lock/unlock topic form
-Then the top post should be a locked discussion
-And the reason of the first topic should be This is a bikeshed
-And the content of the top post should be visible
-
-  # Close-then-unlock doesn't work in IE, it caches the API response (bug 
69160).
-  Scenario: Opening a topic
-Given I am on Flow page
-And I have created a Flow topic
-And the top post has been locked
-And I hover on the Topic Actions link
-And I click the Unlock topic button
-When I type Fun discussion as the reason
-And I submit the lock/unlock topic form
-Then the top post should be an open discussion
-And the content of the top post should be visible
diff --git a/tests/browser/features/mark_topic_as_resolved.feature 
b/tests/browser/features/mark_topic_as_resolved.feature
new file mode 100644
index 000..a040b12
--- /dev/null
+++ b/tests/browser/features/mark_topic_as_resolved.feature
@@ -0,0 +1,29 @@
+@chrome @internet_explorer_10 @firefox @login @clean 
@en.wikipedia.beta.wmflabs.org
+Feature: Mark topic as resolved
+
+  Background:
+Given I am logged in
+And I am on Flow page
+And I have created a Flow topic
+
+  Scenario: Resolving a topic without a summary
+When I mark the first topic as resolved
+And I skip the summary
+Then the first topic is resolved
+
+  Scenario: Resolving a topic and adding a summary
+When I mark the first topic as resolved
+And I summarize as the answer is 42
+Then the first topic is resolved with summary the answer is 42
+
+  Scenario: Resolving a topic and keeping the summary
+Given I summarize the first topic as this answer should be kept
+When I mark the first topic as resolved
+And I keep the summary
+Then the first topic is resolved with summary this answer should be kept
+
+  Scenario: Resolving a topic and updating the summary
+Given I summarize the first topic as this answer should be changed
+When I mark the first topic as resolved
+And I summarize as this is the new answer
+Then the first topic is resolved with summary this is the new answer
diff --git a/tests/browser/features/reopen_topic.feature 
b/tests/browser/features/reopen_topic.feature
new file mode 100644
index 000..c23febb
--- /dev/null
+++ b/tests/browser/features/reopen_topic.feature
@@ -0,0 +1,14 @@
+@chrome @internet_explorer_10 @firefox @login @clean 
@en.wikipedia.beta.wmflabs.org
+Feature: Reopen a resolved topic
+
+  Background:
+Given I am logged in
+And I am on Flow page
+And I have created a Flow topic
+
+  Scenario: Reopening a resolved