Hashar has uploaded a new change for review.

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


Change subject: browsertests: profile for default settings
......................................................................

browsertests: profile for default settings

Some scenarii are meant to be tested on specific wiki instances such as
commmons.beta.wmflabs.org or sandbox.translatewiki.net. For the Gerrit
integration, we are using a fresh wiki having the default ULS settings,
hence the specific tests will definitely fail.

This patch introduces two new cucumber tags which would let finely
select the scenarii to run:

- default-settings : meant to mark tests which should be passing on a
  default installation of MediaWiki and ULS.
- specific-settings : flag tests which require further configuration
  tweaking, for example tests explicitly targetting an already existing
  wiki such as beta or translatewiki

I am introducing a new cucumber profile 'ciwmf' which exclude any test
tagged '@specific-settings' or '@phantomjs-bug'.  That profile is going
to be used by the Jenkins/Gerrit install using something like:

  cucumber -p ciwmf

equivalent to:

  cucumber -t '~@phantomjs-bug' -t '~@specific-settings'

Patch is similiar to the one I have added for ULS with:
  https://gerrit.wikimedia.org/r/#/c/97487/

Same Change-id.

Change-Id: Ib055f5470886e1b818d4c53cb4c61a751d81e154
---
M tests/browser/config/cucumber.yml
M tests/browser/features/create_article.feature
M tests/browser/features/external_links.feature
M tests/browser/features/header_logged_in.feature
M tests/browser/features/image_resolves.feature
M tests/browser/features/language.feature
M tests/browser/features/language_logged_in.feature
M tests/browser/features/login_required_uploads.feature
M tests/browser/features/login_required_watchlist.feature
M tests/browser/features/menu_opens_page.feature
M tests/browser/features/random_ua.feature
M tests/browser/features/search.feature
M tests/browser/features/uploads.feature
M tests/browser/features/watchlist.feature
14 files changed, 23 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/97/97497/1

diff --git a/tests/browser/config/cucumber.yml 
b/tests/browser/config/cucumber.yml
index 150c284..0e7f8ff 100644
--- a/tests/browser/config/cucumber.yml
+++ b/tests/browser/config/cucumber.yml
@@ -1,2 +1,7 @@
+# Cloudbee/Saucelab configuration:
 ci: --format Cucumber::Formatter::Sauce --out reports/junit
+
+# WMF Jenkins/Gerrit:
+ciwmf: -t ~@specific-settings  -t ~@phantomjs-bug
+
 default: --format progress
diff --git a/tests/browser/features/create_article.feature 
b/tests/browser/features/create_article.feature
index 2eb39f5..cfde311 100644
--- a/tests/browser/features/create_article.feature
+++ b/tests/browser/features/create_article.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
+@default-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
 Feature: Create Article
 
   Scenario: Create Article
diff --git a/tests/browser/features/external_links.feature 
b/tests/browser/features/external_links.feature
index 296e8be..02dc97d 100644
--- a/tests/browser/features/external_links.feature
+++ b/tests/browser/features/external_links.feature
@@ -1,7 +1,10 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org
 Feature: Validate External Links
 
   Scenario: External Links resolve
+  This scenario requires an article named Barrack Obama.
+  FIXME: the article should be injected by the test.
+
     Given I am on the Barack_Obama article
      When I expand External Links Section
       And I click on the White House official website link
diff --git a/tests/browser/features/header_logged_in.feature 
b/tests/browser/features/header_logged_in.feature
index a06ae12..e746b0a 100644
--- a/tests/browser/features/header_logged_in.feature
+++ b/tests/browser/features/header_logged_in.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
+@default-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
 Feature: Header Validation - Logged In
 
   Background:
diff --git a/tests/browser/features/image_resolves.feature 
b/tests/browser/features/image_resolves.feature
index 0dde757..3cae444 100644
--- a/tests/browser/features/image_resolves.feature
+++ b/tests/browser/features/image_resolves.feature
@@ -1,7 +1,9 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org
 Feature: Image Resolves to the correct place
 
   Scenario: Image link resolves
+  # This scenario requires an article named Barrack Obama.
+  # FIXME: the article should be injected by the test.
     Given I am on the Barack_Obama article
     When I expand Presidential Campaign Section
     When I click on this image
diff --git a/tests/browser/features/language.feature 
b/tests/browser/features/language.feature
index 0e715cc..ca22716 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org
 Feature: Language Validation
 
   Scenario: Validate Language selection availability
diff --git a/tests/browser/features/language_logged_in.feature 
b/tests/browser/features/language_logged_in.feature
index c6ef3f4..a470ede 100644
--- a/tests/browser/features/language_logged_in.feature
+++ b/tests/browser/features/language_logged_in.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
 Feature: Language Validation - Logged In
 
   Background:
diff --git a/tests/browser/features/login_required_uploads.feature 
b/tests/browser/features/login_required_uploads.feature
index ab49b10..8143b0f 100644
--- a/tests/browser/features/login_required_uploads.feature
+++ b/tests/browser/features/login_required_uploads.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org 
@user_agent
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org @user_agent
 Feature: Login required for Uploads
 
   Scenario: Login for uploads
diff --git a/tests/browser/features/login_required_watchlist.feature 
b/tests/browser/features/login_required_watchlist.feature
index fcb58e1..105d4ee 100644
--- a/tests/browser/features/login_required_watchlist.feature
+++ b/tests/browser/features/login_required_watchlist.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org 
@user_agent
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org @user_agent
 Feature: Login required for Watchlist
 
   Scenario: Login for Uploads
diff --git a/tests/browser/features/menu_opens_page.feature 
b/tests/browser/features/menu_opens_page.feature
index 6527a9e..e269f09 100644
--- a/tests/browser/features/menu_opens_page.feature
+++ b/tests/browser/features/menu_opens_page.feature
@@ -12,6 +12,7 @@
     When I click on Random from the left Nav
     Then my URL should be set to the Random Page
 
+  @specific-settings
   Scenario: Nearby URL is set correctly
     When I click on Nearby from the left Nav
     Then my URL should be set to the Nearby Page
diff --git a/tests/browser/features/random_ua.feature 
b/tests/browser/features/random_ua.feature
index 4f822d1..c6f8509 100644
--- a/tests/browser/features/random_ua.feature
+++ b/tests/browser/features/random_ua.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org 
@user_agent
+@phantomjs-bug @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org @user_agent
 Feature: Setting User Agents
 
   Scenario: Opera Mini
diff --git a/tests/browser/features/search.feature 
b/tests/browser/features/search.feature
index 4f8de6f..8f7cc74 100644
--- a/tests/browser/features/search.feature
+++ b/tests/browser/features/search.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org
 Feature: Search
 
   Scenario: Search for partial text
diff --git a/tests/browser/features/uploads.feature 
b/tests/browser/features/uploads.feature
index a0d2ff8..109d88b 100644
--- a/tests/browser/features/uploads.feature
+++ b/tests/browser/features/uploads.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login 
@test2.m.wikipedia.org
 Feature: Special:Uploads
 
   Scenario: See tutorial as new user
diff --git a/tests/browser/features/watchlist.feature 
b/tests/browser/features/watchlist.feature
index 4602e91..de67b34 100644
--- a/tests/browser/features/watchlist.feature
+++ b/tests/browser/features/watchlist.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @test2.m.wikipedia.org
+@specific-settings @en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org 
@test2.m.wikipedia.org
 Feature: Manage Watchlist
 
   Scenario: I receive notification that I need to log in to use the watchlist 
functionality

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib055f5470886e1b818d4c53cb4c61a751d81e154
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>

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

Reply via email to