Zfilipin has uploaded a new change for review.

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


Change subject: Big cleanup of how tests run
......................................................................

Big cleanup of how tests run

By default, all tests run at en.wikipedia.beta.wmflabs.org and
test2.wikipedia.org.
No tests run at en.wikipedia.org any more.
Removed @phantomjs-bug since we do not use it at the moment.
Sorted Cucumber tags alphabetically.

Change-Id: I6a7cb4cbf824cd7a89b6f441d8310dc24a27e6dc
---
M docs/jobs.md
M features/aftv5.feature
R features/create_account.feature
M features/hotcat.feature
R features/math.feature
M features/page.feature
R features/page_triage.feature
R features/pdf.feature
R features/preferences_appearance.feature
R features/preferences_datetime.feature
R features/print_export_menu.feature
M features/upload_wizard.feature
12 files changed, 14 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/98/85098/1

diff --git a/docs/jobs.md b/docs/jobs.md
index e3e6628..2c3cb54 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -70,37 +70,6 @@
 
 
 
-# browsertests-en.wikipedia.org
-- bundle exec: cucumber features/*_readonly.feature --verbose --profile ci 
--tags @en.wikipedia.org
-- MediaWiki URL: en.wikipedia.org
-
-
-## browsertests-en.wikipedia.org-linux-chrome
-- Browser Label: chrome
-
-## browsertests-en.wikipedia.org-linux-firefox
-- Browser Label: firefox
-
-## browsertests-en.wikipedia.org-windows-internet_explorer_6
-- Browser Label: internet_explorer_6
-- bundle exec: cucumber features/*_readonly.feature --verbose --profile ci 
--tags @en.wikipedia.org --tags ~@ie6-bug
-
-## browsertests-en.wikipedia.org-windows-internet_explorer_7
-- Browser Label: internet_explorer_7
-- bundle exec: cucumber features/*_readonly.feature --verbose --profile ci 
--tags @en.wikipedia.org --tags ~@ie7-bug
-
-## browsertests-en.wikipedia.org-windows-internet_explorer_8
-- Browser Label: internet_explorer_8
-- bundle exec: cucumber features/*_readonly.feature --verbose --profile ci 
--tags @en.wikipedia.org --tags ~@ie8-bug
-
-## browsertests-en.wikipedia.org-windows-internet_explorer_9
-- Browser Label: internet_explorer_9
-
-## browsertests-en.wikipedia.org-windows-internet_explorer_10
-- Browser Label: internet_explorer_10
-
-
-
 # browsertests-sandbox.translatewiki.net
 - bundle exec: cucumber --verbose --profile ci --tags 
@sandbox.translatewiki.net
 - MediaWiki URL: sandbox.translatewiki.net
diff --git a/features/aftv5.feature b/features/aftv5.feature
index ab6a815..a747955 100644
--- a/features/aftv5.feature
+++ b/features/aftv5.feature
@@ -1,5 +1,5 @@
-# 
http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms
 @ie6-bug @phantomjs-bug
[email protected] @ie6-bug @phantomjs-bug
+# 
http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms
 @ie6-bug
[email protected] @ie6-bug
 Feature: AFTv5
 
   Background:
diff --git a/features/create_account_readonly.feature 
b/features/create_account.feature
similarity index 78%
rename from features/create_account_readonly.feature
rename to features/create_account.feature
index 3181074..dd1fd7a 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account.feature
@@ -1,4 +1,3 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org
 Feature: Create account
 
diff --git a/features/hotcat.feature b/features/hotcat.feature
index 70e4e11..124a2a0 100644
--- a/features/hotcat.feature
+++ b/features/hotcat.feature
@@ -1,4 +1,4 @@
[email protected] @login
+@login @test2.wikipedia.org
 
 Feature: Hotcat
 
diff --git a/features/math_readonly.feature b/features/math.feature
similarity index 65%
rename from features/math_readonly.feature
rename to features/math.feature
index b34bfcb..4dead25 100644
--- a/features/math_readonly.feature
+++ b/features/math.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
[email protected] @test2.wikipedia.org @login
[email protected] @login @test2.wikipedia.org
 Feature: Math
 
   Scenario: Display simple math
diff --git a/features/page.feature b/features/page.feature
index aa91b62..b22b2d1 100644
--- a/features/page.feature
+++ b/features/page.feature
@@ -1,4 +1,4 @@
[email protected] @login
[email protected] @login @test2.wikipedia.org
 Feature: Page
 
   Background:
diff --git a/features/page_triage_readonly.feature 
b/features/page_triage.feature
similarity index 78%
rename from features/page_triage_readonly.feature
rename to features/page_triage.feature
index 931c892..7268ddd 100644
--- a/features/page_triage_readonly.feature
+++ b/features/page_triage.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
[email protected] @en.wikipedia.org @test2.wikipedia.org
[email protected] @test2.wikipedia.org
 Feature: PageTriage
 
   Scenario: Check that NewPagesFeed has correct controls for anonymous user
diff --git a/features/pdf_readonly.feature b/features/pdf.feature
similarity index 66%
rename from features/pdf_readonly.feature
rename to features/pdf.feature
index 61cd90a..2aacc41 100644
--- a/features/pdf_readonly.feature
+++ b/features/pdf.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
[email protected] @en.wikipedia.org @ie6-bug  @ie7-bug
[email protected] @ie6-bug  @ie7-bug @test2.wikipedia.org
 Feature: PDF
 
   Scenario: Check for Download as PDF link
diff --git a/features/preferences_appearance_readonly.feature 
b/features/preferences_appearance.feature
similarity index 77%
rename from features/preferences_appearance_readonly.feature
rename to features/preferences_appearance.feature
index b5978f5..bce97a6 100644
--- a/features/preferences_appearance_readonly.feature
+++ b/features/preferences_appearance.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
[email protected] @en.wikipedia.org @login
[email protected] @login @test2.wikipedia.org
 Feature: Preferences Appearance
 
   Scenario: Preferences Appearance
diff --git a/features/preferences_datetime_readonly.feature 
b/features/preferences_datetime.feature
similarity index 60%
rename from features/preferences_datetime_readonly.feature
rename to features/preferences_datetime.feature
index 40d5568..f8f2be9 100644
--- a/features/preferences_datetime_readonly.feature
+++ b/features/preferences_datetime.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
[email protected] @en.wikipedia.org @login @test2.wikipedia.org
[email protected] @login @test2.wikipedia.org
 Feature: Preferences Date Time
 
   Scenario: Preferences Date Time
diff --git a/features/print_export_menu_readonly.feature 
b/features/print_export_menu.feature
similarity index 77%
rename from features/print_export_menu_readonly.feature
rename to features/print_export_menu.feature
index c5d2dba..d3f06cd 100644
--- a/features/print_export_menu_readonly.feature
+++ b/features/print_export_menu.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
[email protected] @en.wikipedia.org
[email protected] @test2.wikipedia.org
 Feature: Print/Export menu Expand and Collapse
 
   Scenario: Check for Print/export section Collapsed
diff --git a/features/upload_wizard.feature b/features/upload_wizard.feature
index 41b2213..62d1544 100644
--- a/features/upload_wizard.feature
+++ b/features/upload_wizard.feature
@@ -1,4 +1,4 @@
[email protected] @login @test2.wikipedia.org @ie6-bug  
@ie7-bug  @ie8-bug
[email protected] @ie6-bug  @ie7-bug  @ie8-bug @login 
@test2.wikipedia.org
 Feature: UploadWizard
 
   Background:
@@ -13,7 +13,7 @@
     When I click Next button at Learn page
     Then Upload page should appear
 
-  @phantomjs-bug
+
   Scenario: Navigate to Release rights page
     When I click Next button at Learn page
       And upload file image.png
@@ -21,7 +21,7 @@
     Then Release rights page should open
       And thumbnail should be visible
 
-  @phantomjs-bug
+
   Scenario: Navigate to Describe page
     When I click Next button at Learn page
       And upload file image.png
@@ -31,7 +31,7 @@
     Then Describe page should open
       And title text field should be there
 
-  @ie6-bug @ie7-bug @ie8-bug @phantomjs-bug
+  @ie6-bug @ie7-bug @ie8-bug
   Scenario: Navigate to Use page
     When I click Next button at Learn page
       And upload file image.png

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a7cb4cbf824cd7a89b6f441d8310dc24a27e6dc
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to