Jdlrobson has uploaded a new change for review.

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

Change subject: Run Gather browser tests on each commit
......................................................................

Run Gather browser tests on each commit

Bug: T107908
Change-Id: If0f122feddb1268d8f02ba44f6b62e664a3d516d
---
M Gemfile
M Gemfile.lock
M tests/browser/environments.yml
M tests/browser/features/add_to_collection.feature
M tests/browser/features/anonymous.feature
M tests/browser/features/menu.feature
M tests/browser/features/new_collection.feature
M tests/browser/features/recent_collections.feature
8 files changed, 25 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/53/230953/1

diff --git a/Gemfile b/Gemfile
index 608173e..aebce34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,4 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'mediawiki_selenium', '~> 1.3.0'
+gem 'mediawiki_selenium', '~> 1.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1eb1505..4b3a0f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    ffi (1.9.8)
+    ffi (1.9.10)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     headless (1.0.2)
@@ -34,18 +34,18 @@
     mediawiki_api (0.4.1)
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
-    mediawiki_selenium (1.3.0)
-      cucumber (~> 1.3, >= 1.3.10)
+    mediawiki_selenium (1.4.0)
+      cucumber (~> 1.3, >= 1.3.20)
       headless (~> 1.0, >= 1.0.1)
       json (~> 1.8, >= 1.8.1)
-      mediawiki_api (~> 0.2, >= 0.2.1)
+      mediawiki_api (~> 0.4, >= 0.4.1)
       page-object (~> 1.0)
       rest-client (~> 1.6, >= 1.6.7)
       rspec-expectations (~> 2.14, >= 2.14.4)
       syntax (~> 1.2, >= 1.2.0)
       thor (~> 0.19, >= 0.19.1)
     mime-types (2.6.1)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     netrc (0.10.3)
@@ -72,8 +72,8 @@
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    watir-webdriver (0.7.0)
-      selenium-webdriver (>= 2.45)
+    watir-webdriver (0.8.0)
+      selenium-webdriver (>= 2.46.2)
     websocket (1.2.2)
     yml_reader (0.5)
 
@@ -81,4 +81,4 @@
   ruby
 
 DEPENDENCIES
-  mediawiki_selenium (~> 1.3.0)
+  mediawiki_selenium (~> 1.4.0)
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index 8f5e4b3..3412d59 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -34,4 +34,9 @@
   mediawiki_user: Selenium_user
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
+integration:
+  browser: chrome
+  user_factory: true
+  # mediawiki_url: JENKINS WILL SET THIS 
+
 default: *default
diff --git a/tests/browser/features/add_to_collection.feature 
b/tests/browser/features/add_to_collection.feature
index 5a7e02c..364960a 100644
--- a/tests/browser/features/add_to_collection.feature
+++ b/tests/browser/features/add_to_collection.feature
@@ -11,6 +11,7 @@
     When I click the watchstar
     Then I see the collection dialog
 
+  @integration
   Scenario: Adding item to existing collection.
     Given I am on the "Selenium Gather test" page
     When I click the watchstar
diff --git a/tests/browser/features/anonymous.feature 
b/tests/browser/features/anonymous.feature
index a5f1c30..6554608 100644
--- a/tests/browser/features/anonymous.feature
+++ b/tests/browser/features/anonymous.feature
@@ -5,15 +5,19 @@
     Given I am not logged in
       And I am using the mobile site
 
+  @integration
   Scenario: Gather shows public view
     When I visit the Gather page
     Then I see the recent collections page
 
+
+  @integration
   Scenario: Clicking tab shows login page
     When I visit the Gather page
         And I click the my collections tab
     Then I see the login page
 
+  @integration
   Scenario: Anons not allowed to view private collections
     When I visit a private collection page
     Then I see the error page
@@ -24,6 +28,7 @@
     When I click the watchstar
     Then I see the anonymous CTA
 
+  @integration
   Scenario: Anons can see my public collection
     When I visit a public collection
     Then I can see items in the collection
diff --git a/tests/browser/features/menu.feature 
b/tests/browser/features/menu.feature
index 2c9e28d..86ad416 100644
--- a/tests/browser/features/menu.feature
+++ b/tests/browser/features/menu.feature
@@ -4,12 +4,14 @@
 Background:
   Given I am using the mobile site
 
+@integration
 Scenario: Check links in menu
   And I have Gather
   And I am on the "Main Page" page
   When I click on the main navigation button
   Then I should see a link to "Collections" in the main navigation menu
 
+@integration
 Scenario: Check links in menu
   And I have Gather
   And I am on the "Special:MobileOptions" page
diff --git a/tests/browser/features/new_collection.feature 
b/tests/browser/features/new_collection.feature
index bdd99ef..fa8fb08 100644
--- a/tests/browser/features/new_collection.feature
+++ b/tests/browser/features/new_collection.feature
@@ -8,9 +8,11 @@
       And I am on the "Selenium Gather test" page
      When I click the watchstar
 
+  @integration
   Scenario: New collection overlay interface visible
     Then I see add to new collection button
 
+  @integration
   Scenario: Inserting a new collection
     When I type "My collection" into the new collection form
      And I click the create collection button
diff --git a/tests/browser/features/recent_collections.feature 
b/tests/browser/features/recent_collections.feature
index 9722c31..f3678bd 100644
--- a/tests/browser/features/recent_collections.feature
+++ b/tests/browser/features/recent_collections.feature
@@ -5,7 +5,7 @@
     Given I am using the mobile site
       And there are more than 100 collections
 
-  @smoke
+  @smoke @integration
   Scenario: Infinite scrolling is working for anonymous users
     Given I am on the "Special:Gather/all/recent" page
       And I see 100 collections

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0f122feddb1268d8f02ba44f6b62e664a3d516d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>

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

Reply via email to