sauce_whisk 0.0.13 → 0.0.14

data/spec/fixtures/vcr_cassettes/info.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -55,7 +55,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -99,7 +99,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -176,7 +176,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -245,4 +245,130 @@ http_interactions:
         dlR7nE0Mmoei+fEfsOfe4odoAAA=
     http_version: 
   recorded_at: Thu, 13 Jun 2013 07:06:39 GMT
-recorded_with: VCR 2.5.0
+- request:
+    method: get
+    uri: https://saucelabs.com/rest/v1/info/status
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 08 Jul 2014 04:26:38 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - http://status.saucelabs.com
+      X-Backend:
+      - mix
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAAy2MSw6CQAxA956i6ZoQhBlFllxk0gyNNoqQaYEF4e5CcP0+
+        Ky4kFkx6xgaK/Obu/vrwdVk676qizgCV0yyRwzByIpPhS59dtTTxAY1s0tCz
+        Kj2PBbakEuEfwckhvji+FUZS5S7H7fIDE3jQhHgAAAA=
+    http_version: 
+  recorded_at: Tue, 08 Jul 2014 04:26:32 GMT
+- request:
+    method: get
+    uri: https://saucelabs.com/rest/v1/info/status
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 08 Jul 2014 04:33:38 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - http://status.saucelabs.com
+      X-Backend:
+      - mix
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAAy2MzQ6CMAyA7zxF0zMhCwwQj7zI0owGGkTI2unB+O5K9Pz9
+        vPBJYsFkY7yCq9rGXfrOD97VzeC8LwGV00Mih/3gRCb7nW5f1VLmExpZ1rCx
+        Ks3nAkdSifCP4MchLhxXhYNUearwXXwASBpagngAAAA=
+    http_version: 
+  recorded_at: Tue, 08 Jul 2014 04:33:32 GMT
+- request:
+    method: get
+    uri: https://saucelabs.com/rest/v1/info/status
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 08 Jul 2014 04:33:51 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - http://status.saucelabs.com
+      X-Backend:
+      - mix
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAAy2MSw6CQAxA956i6doQ+UxwXHKRSTM20iBCph1YEO4uRNfv
+        s+FKYsFkZHzArXCVr3zja9e48l635RVQOS0SOUwzJzKZPvQ+VEuZT2hkWcPI
+        qvQ6F9iRSoR/BD8Osec4KMykys8C98sXaUzMpHgAAAA=
+    http_version: 
+  recorded_at: Tue, 08 Jul 2014 04:33:44 GMT
+recorded_with: VCR 2.9.2

data/spec/fixtures/vcr_cassettes/jobs.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -100,7 +100,7 @@ http_interactions:
       string: '{"passed":true}'
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       Content-Length:
@@ -152,7 +152,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -202,7 +202,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       User-Agent:
@@ -248,7 +248,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       Content-Length:
@@ -298,7 +298,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       Content-Length:
@@ -348,7 +348,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       Content-Length:
@@ -402,7 +402,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       Content-Length:
@@ -456,7 +456,7 @@ http_interactions:
       string: ''
     headers:
       Accept:
-      - '*/*; q=0.5, application/xml'
+      - "*/*; q=0.5, application/xml"
       Accept-Encoding:
       - gzip, deflate
       Content-Length:
@@ -498,4 +498,124 @@ http_interactions:
       string: '{"errors": "Not Found"}'
     http_version: 
   recorded_at: Mon, 10 Jun 2013 08:54:49 GMT
-recorded_with: VCR 2.5.0
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/jobs/1ca64b180cfa40e0a4aee5a4a482f271/assets
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Fri, 11 Jul 2014 04:54:09 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: |
+        "Job hasn't finished running"
+    http_version: 
+  recorded_at: Fri, 11 Jul 2014 04:53:50 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/jobs/1ca64b180cfa40e0a4aee5a4a482f271/assets
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Fri, 11 Jul 2014 04:59:38 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      X-Backend:
+      - mix
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA6tWKk4sTU7VzclPV7JSUAJSelnF+XlKOgpKZZkpqfkgQTBD
+        Ly2nDCRanJqTmpdZmgvTAecXpxaVpRbpgYRBypKLUlPzijPyS4qBqqKVDIAA
+        IaZXkAdWBRQ0xCpqhFXUGE00tpYLAPwfWkvAAAAA
+    http_version: 
+  recorded_at: Fri, 11 Jul 2014 04:59:18 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/jobs/1ca64b180cfa40e0a4aee5a4a482f271
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Fri, 11 Jul 2014 07:03:49 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      X-Backend:
+      - mix
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA61Sy07kMBC88xVWzkweKAMDNz6AE+KAEIo6dmfGu447crcH
+        0Gr/HXd2VzPishcOseSqVj3a+VWNid4Y08AHSjIcMbGnWN2Z6qa6NNXRO6Qh
+        p6DIQWThu6YBZhSuGbLFACPXlubmB43cdBau+7HbtXaCvsUWekDclrPfXU1X
+        N12z6tVTOKq4TQhS3AbxMxaDrm+37bbvu52SmYXmjQOBQsUcQgH/hT2PWbe1
+        itFbxKSA+wgQQdZ0Snin6P+S6WSg/TdWZQwYfZ43JXDJWxd1NRmzD+7UaFEH
+        vUvKqPc8Bm9PPAtIZo1UnJeAsnYS2Cv28vpnojzc1xXeqlaid7+KTxBY1YvG
+        DNHxEEkGztYi85S18bawEVaN6plyMk8ltrnfYxTzeKAcnBnRlGUYsJaS83Fv
+        hIwc0CwJNylHzVXEM4QzQ4zuS7TyKZ4SpVNLWhs+gDVdW9+uayr/xs+FfBQ8
+        29bf99dhhgmSr35ffAJrf/AcwwIAAA==
+    http_version: 
+  recorded_at: Fri, 11 Jul 2014 07:03:28 GMT
+recorded_with: VCR 2.9.2

data/spec/lib/sauce_whisk/account_spec.rb

@@ -13,12 +13,12 @@ describe SauceWhisk::Account do
       }
 
       test_account = SauceWhisk::Account.new options
-      test_account.access_key.should eq 12345
-      test_account.minutes.should eq 23
-      test_account.mac_minutes.should eq 11
-      test_account.manual_minutes.should eq 4
-      test_account.mac_manual_minutes.should eq 87
-      test_account.username.should eq "someone"
+      expect( test_account.access_key ).to eq 12345
+      expect( test_account.minutes ).to eq 23
+      expect( test_account.mac_minutes ).to eq 11
+      expect( test_account.manual_minutes ).to eq 4
+      expect( test_account.mac_manual_minutes ).to eq 87
+      expect( test_account.username ).to eq "someone"
     end
 
     it "sets concurrency figures" do
@@ -28,8 +28,8 @@ describe SauceWhisk::Account do
       }
 
       test_account = SauceWhisk::Account.new concurrencies
-      test_account.mac_concurrency.should eq 23
-      test_account.total_concurrency.should eq 100
+      expect( test_account.mac_concurrency ).to eq 23
+      expect( test_account.total_concurrency ).to eq 100
     end
   end
 

data/spec/lib/sauce_whisk/accounts_spec.rb

@@ -12,23 +12,23 @@ describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts", :match_req
     it "returns an Account object" do
       username = ENV["SAUCE_USERNAME"]
       account = SauceWhisk::Accounts.fetch(username)
-      account.should be_an_instance_of SauceWhisk::Account
+      expect( account ).to be_an_instance_of SauceWhisk::Account
 
-      account.username.should eq username
-      account.access_key.should_not be_nil
+      expect( account.username) .to eq username
+      expect( account.access_key ).to_not be_nil
     end
 
     it "includes the concurrency by default" do
       account = SauceWhisk::Accounts.fetch ENV["SAUCE_USERNAME"]
       assert_requested :get, "https://#{auth}@saucelabs.com/rest/v1/#{ENV["SAUCE_USERNAME"]}/limits"
-      account.total_concurrency.should eq 20
-      account.mac_concurrency.should eq 5
+      expect( account.total_concurrency ).to eq 20
+      expect( account.mac_concurrency ).to eq 5
     end
 
     it "should not include concurrency when conservative is set to false" do
       account = SauceWhisk::Accounts.fetch(ENV["SAUCE_USERNAME"], false)
       assert_not_requested :get, "https://#{auth}@saucelabs.com/rest/v1/#{ENV["SAUCE_USERNAME"]}/limits"
-      account.total_concurrency.should be_nil
+      expect( account.total_concurrency ).to be_nil
     end
 
     context "with an invalid account" do
@@ -84,7 +84,7 @@ describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts", :match_req
       sub = SauceWhisk::Accounts.create_subaccount(parent, "Manny", "newsub77",
           "Manny@blackbooks.co.uk", "davesdisease")
 
-      sub.should be_a_kind_of SauceWhisk::Account
+      expect( sub ).to be_a_kind_of SauceWhisk::Account
     end
 
     it "returns a Subaccount, parented to the Parent account" do
@@ -93,7 +93,7 @@ describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts", :match_req
       sub = SauceWhisk::Accounts.create_subaccount(parent, "Manny", "newsub77",
                                                    "Manny@blackbooks.co.uk", "davesdisease")
 
-      sub.parent.should be parent
+      expect( sub.parent ).to be parent
     end
 
     context "trying to create too many subaccounts" do

data/spec/lib/sauce_whisk/asset_spec.rb

@@ -15,25 +15,25 @@ describe SauceWhisk::Asset do
     end
 
     it "should store the name" do
-      @asset.name.should eq name
+      expect( @asset.name ).to eq name
     end
 
     it "should store the data" do
-      @asset.data.should eq data
+      expect( @asset.data ).to eq data
     end
 
     it "should store the type" do
-      @asset.asset_type.should eq type
+      expect( @asset.asset_type ).to eq type
     end
 
     it "should store the job_id" do
-      @asset.job.should eq job_id
+      expect( @asset.job ).to eq job_id
     end
   end
 
   describe "#type" do
     it "should default to screenshot" do
-      SauceWhisk::Asset.new.asset_type.should eq :screenshot
+      expect( SauceWhisk::Asset.new.asset_type ).to eq :screenshot
     end
   end
 end