Zfilipin has uploaded a new change for review.

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

Change subject: WIP [BrowserTest] Simplify creating of Jenkins jobs for running 
browser tests daily
......................................................................

WIP [BrowserTest] Simplify creating of Jenkins jobs for running browser tests 
daily

Bug: T128190
Change-Id: I11554b23a0e347736a67766f8c0b9879d5a6bed9
---
M Gemfile
M Gemfile.lock
M Rakefile
A modules/ve-mw/tests/browser/ci.yml
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
5 files changed, 43 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/60/281960/1

diff --git a/Gemfile b/Gemfile
index d63acc6..c4c10e6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 
 gem 'commons_upload', '~> 0.0.4'
-gem 'mediawiki_selenium', '~> 1.6.5'
+gem 'mediawiki_selenium',
+    git: 'https://github.com/zeljkofilipin/mediawiki-selenium.git',
+    branch: 'T128190-16'
 gem 'rake', '~> 10.4', '>= 10.4.2'
 gem 'rubocop', '~> 0.32.1', require: false
 gem 'screenshot', '~> 0.0.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 72b6308..8aae500 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,20 @@
+GIT
+  remote: https://github.com/zeljkofilipin/mediawiki-selenium.git
+  revision: 6cfd153b18c2d41fdfe7d330dc1ae7fd7749f45f
+  branch: T128190-16
+  specs:
+    mediawiki_selenium (1.6.5)
+      cucumber (~> 1.3, >= 1.3.20)
+      headless (~> 2.0, >= 2.1.0)
+      json (~> 1.8, >= 1.8.1)
+      mediawiki_api (~> 0.5, >= 0.5.0)
+      page-object (~> 1.0)
+      rest-client (~> 1.6, >= 1.6.7)
+      rspec-core (~> 2.14, >= 2.14.4)
+      rspec-expectations (~> 2.14, >= 2.14.4)
+      syntax (~> 1.2, >= 1.2.0)
+      thor (~> 0.19, >= 0.19.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -22,7 +39,7 @@
     diff-lcs (1.2.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    faker (1.6.1)
+    faker (1.6.3)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -32,7 +49,7 @@
     ffi (1.9.10)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    headless (2.2.0)
+    headless (2.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
@@ -40,18 +57,7 @@
     mediawiki_api (0.5.0)
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
-    mediawiki_selenium (1.6.5)
-      cucumber (~> 1.3, >= 1.3.20)
-      headless (~> 2.0, >= 2.1.0)
-      json (~> 1.8, >= 1.8.1)
-      mediawiki_api (~> 0.5, >= 0.5.0)
-      page-object (~> 1.0)
-      rest-client (~> 1.6, >= 1.6.7)
-      rspec-core (~> 2.14, >= 2.14.4)
-      rspec-expectations (~> 2.14, >= 2.14.4)
-      syntax (~> 1.2, >= 1.2.0)
-      thor (~> 0.19, >= 0.19.1)
-    mime-types (2.99)
+    mime-types (2.99.1)
     multi_json (1.11.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
@@ -81,12 +87,11 @@
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
-    rubyzip (1.1.7)
+    rubyzip (1.2.0)
     screenshot (0.0.7)
       chunky_png (~> 1.3.3)
-    selenium-webdriver (2.50.0)
+    selenium-webdriver (2.53.0)
       childprocess (~> 0.5)
-      multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     syntax (1.2.0)
@@ -96,7 +101,7 @@
     unf_ext (0.0.7.1)
     watir-webdriver (0.9.1)
       selenium-webdriver (>= 2.46.2)
-    websocket (1.2.2)
+    websocket (1.2.3)
     yml_reader (0.7)
 
 PLATFORMS
@@ -104,7 +109,7 @@
 
 DEPENDENCIES
   commons_upload (~> 0.0.4)
-  mediawiki_selenium (~> 1.6.5)
+  mediawiki_selenium!
   rake (~> 10.4, >= 10.4.2)
   rubocop (~> 0.32.1)
   screenshot (~> 0.0.7)
diff --git a/Rakefile b/Rakefile
index 6eef121..029febd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,6 +8,9 @@
   task.options = ['-c', '.rubocop.yml']
 end
 
+require 'mediawiki_selenium/rake_task'
+MediawikiSelenium::RakeTask.new(test_dir: 'modules/ve-mw/tests/browser')
+
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
diff --git a/modules/ve-mw/tests/browser/ci.yml 
b/modules/ve-mw/tests/browser/ci.yml
new file mode 100644
index 0000000..df0a3a7
--- /dev/null
+++ b/modules/ve-mw/tests/browser/ci.yml
@@ -0,0 +1,11 @@
+BROWSER:
+  - firefox
+
+MEDIAWIKI_ENVIRONMENT:
+  - beta
+
+PLATFORM:
+  - Linux
+
+VERSION:
+  - ''
diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 3c72a18..b243fe0 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -6,8 +6,8 @@
 
   def self.translate(string)
     language = ENV['LANGUAGE_SCREENSHOT_CODE']
-    file_name = (File.exist?("../../i18n/#{language}.json")) ? 
"../../i18n/#{language}.json" : '../../i18n/en.json'
-    json = JSON.parse(File.read(file_name))
+    file_name = (File.exist?("../../i18n/#{language}.json")) ? 
"../../i18n/#{language}.json" : '../../../i18n/en.json'
+    json = JSON.parse(File.read(File.join(__dir__, file_name)))
     json[string] || ''
   end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11554b23a0e347736a67766f8c0b9879d5a6bed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>

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

Reply via email to