jenkins-bot has submitted this change and it was merged.

Change subject: Merging all Cucumber preference feature files to one
......................................................................


Merging all Cucumber preference feature files to one

Bug: 62636
Change-Id: Iaec791ddb00822d8995714f09812c658fa2172a5
---
A tests/browser/features/preferences.feature
D tests/browser/features/preferences_appearance.feature
D tests/browser/features/preferences_datetime.feature
D tests/browser/features/preferences_editing.feature
D tests/browser/features/preferences_user_profile.feature
5 files changed, 73 insertions(+), 110 deletions(-)

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



diff --git a/tests/browser/features/preferences.feature 
b/tests/browser/features/preferences.feature
new file mode 100644
index 0000000..53527cd
--- /dev/null
+++ b/tests/browser/features/preferences.feature
@@ -0,0 +1,73 @@
+#
+# This file is subject to the license terms in the LICENSE file found in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
+# qa-browsertests, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
+#
+@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 
@internet_explorer_7 @internet_explorer_8 @internet_explorer_9 
@internet_explorer_10 @login @phantomjs @test2.wikipedia.org
+Feature: Preferences
+
+  Scenario: Preferences Appearance
+    Given I am logged in
+    When I navigate to Preferences
+      And I click Appearance
+    Then I can select skins
+      And I have a link to Custom CSS
+      And I have a link to Custom Javascript
+      And I can select image size
+      And I can select thumbnail size
+      And I can select Threshold for stub link
+      And I can select underline preferences
+      And I have advanced options checkboxes
+      And I have Math options radio buttons
+      And I can click Save
+      And I can restore default settings
+
+
+  Scenario: Preferences Date Time
+    Given I am logged in
+    When I navigate to Preferences
+      And I click Date and time
+    Then I can select date format
+      And I can see server time
+      And I can see local time
+      And I can select my time zone
+
+
+  Scenario: Preferences Editing
+    Given I am logged in
+    When I navigate to Preferences
+      And I click Editing
+    Then I can select edit area font style
+      And I can select section editing via edit links
+      And I can select section editing by right clicking
+      And I can select section editing by double clicking
+      And I can select to prompt me when entering a blank edit summary
+      And I can select to warn me when I leave an edit page with unsaved 
changes
+      And I can select show edit toolbar
+      And I can select enable enhanced editing toolbar
+      And I can select enable wizards for inserting links, tables as well as 
the search and replace function
+      And I can select show preview on first edit
+      And I can select show preview before edit box
+      And I can select live preview
+
+
+  Scenario: Preferences User profile
+    Given I am logged in
+    When I navigate to Preferences
+      And I click User profile
+    Then I can see my Basic informations
+      And I can change my language
+      And I can change my gender
+      And I have more language settings
+      And I can see my signature
+      And I can change my signature
+      And I can see my email
+      And I can change my email options
+      And I can click Save
+      And I can restore default settings
diff --git a/tests/browser/features/preferences_appearance.feature 
b/tests/browser/features/preferences_appearance.feature
deleted file mode 100644
index 8dab75b..0000000
--- a/tests/browser/features/preferences_appearance.feature
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 
@internet_explorer_7 @internet_explorer_8 @internet_explorer_9 
@internet_explorer_10 @login @phantomjs @test2.wikipedia.org
-Feature: Preferences Appearance
-
-  Scenario: Preferences Appearance
-    Given I am logged in
-    When I navigate to Preferences
-      And I click Appearance
-    Then I can select skins
-      And I have a link to Custom CSS
-      And I have a link to Custom Javascript
-      And I can select image size
-      And I can select thumbnail size
-      And I can select Threshold for stub link
-      And I can select underline preferences
-      And I have advanced options checkboxes
-      And I have Math options radio buttons
-      And I can click Save
-      And I can restore default settings
diff --git a/tests/browser/features/preferences_datetime.feature 
b/tests/browser/features/preferences_datetime.feature
deleted file mode 100644
index d46d036..0000000
--- a/tests/browser/features/preferences_datetime.feature
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 
@internet_explorer_7 @internet_explorer_8 @internet_explorer_9 
@internet_explorer_10 @login @phantomjs @test2.wikipedia.org
-Feature: Preferences Date Time
-
-  Scenario: Preferences Date Time
-    Given I am logged in
-    When I navigate to Preferences
-      And I click Date and time
-    Then I can select date format
-      And I can see server time
-      And I can see local time
-      And I can select my time zone
diff --git a/tests/browser/features/preferences_editing.feature 
b/tests/browser/features/preferences_editing.feature
deleted file mode 100644
index eb5d1df..0000000
--- a/tests/browser/features/preferences_editing.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 
@internet_explorer_7 @internet_explorer_8 @internet_explorer_9 
@internet_explorer_10 @login @phantomjs @test2.wikipedia.org
-Feature: Preferences Editing
-
-  Scenario: Preferences Date Time
-    Given I am logged in
-    When I navigate to Preferences
-      And I click Editing
-    Then I can select edit area font style
-      And I can select section editing via edit links
-      And I can select section editing by right clicking
-      And I can select section editing by double clicking
-      And I can select to prompt me when entering a blank edit summary
-      And I can select to warn me when I leave an edit page with unsaved 
changes
-      And I can select show edit toolbar
-      And I can select enable enhanced editing toolbar
-      And I can select enable wizards for inserting links, tables as well as 
the search and replace function
-      And I can select show preview on first edit
-      And I can select show preview before edit box
-      And I can select live preview
-
diff --git a/tests/browser/features/preferences_user_profile.feature 
b/tests/browser/features/preferences_user_profile.feature
deleted file mode 100644
index 1440154..0000000
--- a/tests/browser/features/preferences_user_profile.feature
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 
@internet_explorer_7 @internet_explorer_8 @internet_explorer_9 
@internet_explorer_10 @login @phantomjs @test2.wikipedia.org
-Feature: Preferences User profile
-
-  Scenario: Preferences User profile
-    Given I am logged in
-    When I navigate to Preferences
-      And I click User profile
-    Then I can see my Basic informations
-      And I can change my language
-      And I can change my gender
-      And I have more language settings
-      And I can see my signature
-      And I can change my signature
-      And I can see my email
-      And I can change my email options
-      And I can click Save
-      And I can restore default settings

-- 
To view, visit https://gerrit.wikimedia.org/r/119933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaec791ddb00822d8995714f09812c658fa2172a5
Gerrit-PatchSet: 4
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Jagori79 <jagor...@gmail.com>
Gerrit-Reviewer: Cmcmahon <cmcma...@wikimedia.org>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to