Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81186
Change subject: Use RestClient to communicate with saucelabs API
......................................................................
Use RestClient to communicate with saucelabs API
Change-Id: I9968136cd0eb9d5399e40d25b7d4ae96e8661295
---
M selenium_cuc/Gemfile
M selenium_cuc/Gemfile.lock
M selenium_cuc/features/support/env.rb
3 files changed, 24 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/81186/1
diff --git a/selenium_cuc/Gemfile b/selenium_cuc/Gemfile
index 2ab087d..a3a4fae 100644
--- a/selenium_cuc/Gemfile
+++ b/selenium_cuc/Gemfile
@@ -8,3 +8,4 @@
gem 'json'
gem 'activesupport'
gem 'net-http-persistent'
+gem 'rest-client'
\ No newline at end of file
diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 720daf3..da9f775 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -31,6 +31,7 @@
multi_json (~> 1.3)
i18n (0.6.5)
json (1.8.0)
+ mime-types (1.24)
minitest (4.7.5)
multi_json (1.7.9)
multi_test (0.0.2)
@@ -42,6 +43,8 @@
page_navigation (0.9)
data_magic (>= 0.14)
require_all (1.2.1)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
rspec-expectations (2.14.2)
diff-lcs (>= 1.1.3, < 2.0)
rubyzip (0.9.9)
@@ -70,5 +73,6 @@
net-http-persistent
page-object
require_all
+ rest-client
rspec-expectations
syntax
diff --git a/selenium_cuc/features/support/env.rb
b/selenium_cuc/features/support/env.rb
index 2e4b2a5..62ee28a 100644
--- a/selenium_cuc/features/support/env.rb
+++ b/selenium_cuc/features/support/env.rb
@@ -16,6 +16,7 @@
require 'yaml'
require 'net/http'
require 'active_support/all'
+require 'rest_client'
require 'require_all'
config = YAML.load_file('config/config.yml')
@@ -102,10 +103,25 @@
%x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}}
end
+def sauce_rest(body)
+ http =
"https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}"
+
+ RestClient::Request.execute(
+ :method => :put,
+ :url => http,
+ :user => ENV['SAUCE_ONDEMAND_USERNAME'],
+ :password => ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
+ :headers => {:content_type => "application/json"},
+ :payload => body.to_json
+ )
+end
+
After do |scenario|
- if environment == :cloudbees && !ENV["windir"]
- sauce_api(%Q{{"passed": #{scenario.passed?}}})
- sauce_api(%Q{{"public": true}})
+ if environment == :cloudbees# && !ENV["windir"]
+ #sauce_api(%Q{{"passed": #{scenario.passed?}}})
+ #sauce_api(%Q{{"public": true}})
+ sauce_rest(%Q{{"passed": #{scenario.passed?}}})
+ sauce_rest(%Q{{"public": true}})
end
@browser.close
end
--
To view, visit https://gerrit.wikimedia.org/r/81186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9968136cd0eb9d5399e40d25b7d4ae96e8661295
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
