test_object_test_result_watcher 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58e3402351c1ae95bd5b2da5938cff519ddcadf
-  data.tar.gz: 5c19d2d778f109199b3a77b2814b118de8c8c652
+  metadata.gz: 2079657ee2f3dbee40731e322860bbda4d4c710a
+  data.tar.gz: b43a21343390d0835f2f14329a1ec4db74aaffb9
 SHA512:
-  metadata.gz: d856a71775562c43b08e3dc1ec17d43faa5a87bbc9a0ec348ccf8a03eb4783815a3b67571bb28941cc4acfce150d7d7c2c1639d0dec8b195140616b993e98666
-  data.tar.gz: 325892d81d6b876fe41dcd2437c88f1bc6eb9d84875605a5202519aa75721dc39af27f8a5ac826b376f3263390f0c38733653617ebd106d55442742d29181ac9
+  metadata.gz: 8ca543f96dab0e2623b1750e36c3b05d524d558315e446c586d21854b70416c9691171f39e9ad5707b7da2a688d6336bd5b41fd563cb405b48d4674683acd697
+  data.tar.gz: 2f3f7f84c0afa2cd005f79f54382015eeb513255b1b42ac1f0769df4541820476ab6c0a0a9b11b5c29489bfb2d3c03037dc1fa636dc5795c9d0566d88d977c33

data/lib/appium_resource.rb

@@ -1,6 +1,6 @@
 module AppiumResource
-  def AppiumResource.update_test_report_status( session_id, passed, client )
-    client.build_path( session_id )
+  def self.update_test_report_status(session_id, passed, client)
+    client.build_path(session_id)
     client.put_test_outcome(passed)
   end
-end
+end

data/lib/{rest_client.rb → test_object_rest_client.rb}

@@ -1,7 +1,8 @@
 require 'httparty'
 require 'json'
 
-class RestClient
+class TestObjectRestClient
+
   def initialize(parameters)
     @api_url = parameters[:api_url]
     @api_key = parameters[:api_key]
@@ -16,10 +17,11 @@ class RestClient
   end
 
   def basic_authorization
-    {username: @api_key, password: ""}
+    { username: @api_key, password: '' }
   end
 
   def headers
-    { "Content-Type" => "application/json"}
+    { 'Content-Type' => 'application/json' }
   end
-end
+
+end

data/lib/test_object_test_result_watcher.rb

@@ -1,6 +1,6 @@
 require 'json'
-require_relative './appium_resource.rb'
-require_relative './rest_client.rb'
+require_relative 'appium_resource.rb'
+require_relative 'test_object_rest_client'
 
 class TestObjectTestResultWatcher
 
@@ -8,31 +8,22 @@ class TestObjectTestResultWatcher
     @desired_capabilities = desired_capabilities
     @driver = driver
     @report_results = @desired_capabilities[:caps][:testobject_report_results]
-    if @report_results
-      set_client
-    end
+    set_client if @report_results
   end
 
   def set_client
-    relative_url = "/api/rest/appium/v1/"
-    base_url = base_url(@desired_capabilities[:appium_lib][:server_url])
+    rest_api_url = 'https://app.testobject.com/api/rest/v2/appium/'
     testobject_api_key = @desired_capabilities[:caps][:testobject_api_key]
-    api_url = base_url + relative_url
-    @client = RestClient.new(api_url: api_url, api_key: testobject_api_key)
-  end
-
-  def base_url(server_url)
-    server_url.match(/^https?:\/\/(www.)?\S+.com(:\d+)?/)[0]
+    @client = TestObjectRestClient.new(api_url: rest_api_url, api_key: testobject_api_key)
   end
 
   def report_results_and_cleanup(passed)
-    if @report_results
-      report_results(passed)
-    end
+    report_results(passed) if @report_results
     @driver.quit
   end
 
   def report_results(passed)
     AppiumResource.update_test_report_status(@driver.session_id, passed, @client)
   end
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_object_test_result_watcher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - TestObject
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -31,7 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/appium_resource.rb
-- lib/rest_client.rb
+- lib/test_object_rest_client.rb
 - lib/test_object_test_result_watcher.rb
 homepage: http://www.testobject.com
 licenses: []