From 7bc7a0cabfecccb13aad8e1a94f284c7f02c0f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljko=20Filipin?= Date: Mon, 29 Feb 2016 16:07:16 +0100 Subject: [PATCH] Migration of browsertests* Jenkins jobs to selenium* jobs selenium* jobs are a new way of running Ruby based Selenium tests. The jobs are triggered daily. Bug: T128190 Change-Id: Ide349ea15e0c38ff9f61d348abd61cd2349a83f6 --- Gemfile | 2 +- Gemfile.lock | 21 ++++++++++----------- Rakefile | 3 +++ tests/browser/ci.yml | 9 +++++++++ tests/browser/environments.yml | 1 + 5 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 tests/browser/ci.yml diff --git a/Gemfile b/Gemfile index 7689031..eba618a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.5' +gem 'mediawiki_selenium', '~> 1.7' gem 'rake', '~> 10.5' gem 'rubocop', '~> 0.33.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index e0c8c2c..6ca6d70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,9 +17,9 @@ GEM faker (>= 1.1.2) yml_reader (>= 0.6) diff-lcs (1.2.5) - domain_name (0.5.20160128) + domain_name (0.5.20160310) 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) @@ -29,7 +29,7 @@ GEM 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) @@ -37,7 +37,7 @@ GEM mediawiki_api (0.5.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (1.6.5) + mediawiki_selenium (1.7.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) json (~> 1.8, >= 1.8.1) @@ -48,8 +48,8 @@ GEM rspec-expectations (~> 2.14, >= 2.14.4) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) - mime-types (2.99) - multi_json (1.11.2) + mime-types (2.99.1) + multi_json (1.11.3) multi_test (0.1.2) multipart-post (2.0.0) netrc (0.11.0) @@ -78,10 +78,9 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) - rubyzip (1.1.7) - selenium-webdriver (2.50.0) + rubyzip (1.2.0) + selenium-webdriver (2.53.0) childprocess (~> 0.5) - multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.0) @@ -91,14 +90,14 @@ GEM unf_ext (0.0.7.2) watir-webdriver (0.9.1) selenium-webdriver (>= 2.46.2) - websocket (1.2.2) + websocket (1.2.3) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.6.5) + mediawiki_selenium (~> 1.7) rake (~> 10.5) rubocop (~> 0.33.0) diff --git a/Rakefile b/Rakefile index 6eef121..2877bf6 100644 --- a/Rakefile +++ b/Rakefile @@ -8,6 +8,9 @@ RuboCop::RakeTask.new(:rubocop) do |task| task.options = ['-c', '.rubocop.yml'] end +require 'mediawiki_selenium/rake_task' +MediawikiSelenium::RakeTask.new + task default: [:test] desc 'Run all build/tests commands (CI entry point)' diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml new file mode 100644 index 0000000..c2eca93 --- /dev/null +++ b/tests/browser/ci.yml @@ -0,0 +1,9 @@ +BROWSER: + - chrome + - firefox + +MEDIAWIKI_ENVIRONMENT: + - beta + +PLATFORM: + - Linux diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 35eb153..1c5406b 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -14,6 +14,7 @@ # export MEDIAWIKI_USER=Selenium_user2 # bundle exec cucumber # + mw-vagrant-host: &default user_factory: true mediawiki_url: http://127.0.0.1:8080/wiki/