Change to update specs to remove global state mutation.

piotrmurach · piotrmurach · commit 1934bf08e236 · 2016-06-19T22:23:21.000+01:00
diff --git a/spec/github/authorization_spec.rb b/spec/github/authorization_spec.rb
@@ -145,8 +145,8 @@
       let(:options) { { :basic_auth => 'github:pass' } }
 
       it "should return hash with basic auth params" do
-        expect(github.authentication).to be_a Hash
-        expect(github.authentication).to have_key(:basic_auth)
+        expect(github.authentication).to include({login: 'github'})
+        expect(github.authentication).to include({password: 'pass'})
       end
     end
 
diff --git a/spec/github/client/authorizations/app/check_spec.rb b/spec/github/client/authorizations/app/check_spec.rb
@@ -2,21 +2,19 @@
 
 require 'spec_helper'
 
-describe Github::Client::Authorizations::App, '#check' do
+RSpec.describe Github::Client::Authorizations::App, '#check' do
   let(:basic_auth) { 'login:password' }
   let(:host)       { "https://#{basic_auth}@api.github.com" }
   let(:request_path) { "/applications/#{client_id}/tokens/#{access_token}" }
   let(:client_id) { 1 }
   let(:access_token) { 'abc123' }
 
-  before {
-    subject.basic_auth = basic_auth
+  subject { described_class.new(basic_auth: basic_auth) }
 
+  before do
     stub_get(request_path, host).to_return(body: body, status: status,
       headers: {content_type: 'application/json; charset=utf-8'})
-  }
-
-  after { reset_authentication_for(subject) }
+  end
 
   context 'when app makes a request' do
     let(:body)   { "" }
diff --git a/spec/github/client/authorizations/app/create_spec.rb b/spec/github/client/authorizations/app/create_spec.rb
@@ -2,18 +2,18 @@
 
 require 'spec_helper'
 
-describe Github::Client::Authorizations::App, '#create' do
+RSpec.describe Github::Client::Authorizations::App, '#create' do
   let(:basic_auth) { 'login:password' }
   let(:host)       { "https://#{basic_auth}@api.github.com" }
   let(:inputs)     { { :scopes => ['repo'] } }
   let(:request_path) { "/authorizations/clients/#{client_id}" }
 
-  before {
-    subject.basic_auth = basic_auth
+  subject { described_class.new(basic_auth: basic_auth) }
 
+  before do
     stub_put(request_path, host).to_return(body: body, status: status,
       headers: {content_type: 'application/json; charset=utf-8'})
-  }
+  end
 
   after { reset_authentication_for(subject) }
 
diff --git a/spec/github/client/authorizations/app/delete_spec.rb b/spec/github/client/authorizations/app/delete_spec.rb
@@ -2,19 +2,17 @@
 
 require 'spec_helper'
 
-describe Github::Client::Authorizations::App, '#delete' do
+RSpec.describe Github::Client::Authorizations::App, '#delete' do
   let(:basic_auth)   { 'login:password' }
   let(:host)         { "https://#{basic_auth}@api.github.com" }
   let(:client_id) { 1 }
 
-  before {
-    stub_delete(request_path, host).to_return(:body => body, :status => status,
-      :headers => {:content_type => "application/json; charset=utf-8"})
-  }
+  subject { described_class.new(basic_auth: basic_auth) }
 
-  before { subject.basic_auth = basic_auth }
-
-  after { reset_authentication_for(subject) }
+  before do
+    stub_delete(request_path, host).to_return(body: body, status: status,
+      headers: {content_type: "application/json; charset=utf-8"})
+  end
 
   context "when app revokes all tokens" do
     let(:request_path) { "/applications/#{client_id}/tokens" }
diff --git a/spec/github/client/authorizations/create_spec.rb b/spec/github/client/authorizations/create_spec.rb
@@ -8,14 +8,12 @@
   let(:inputs)       { {scopes: ['repo'], note: 'admin script' } }
   let(:request_path) { "/authorizations" }
 
-  before {
-    subject.basic_auth = basic_auth
+  subject { described_class.new(basic_auth: basic_auth) }
 
+  before do
     stub_post(request_path, host).to_return(body: body, status: status,
       headers: {content_type: 'application/json; charset=utf-8'})
-  }
-
-  after { reset_authentication_for(subject) }
+  end
 
   context 'when user creates token' do
     let(:body) { fixture('auths/authorization.json') }
diff --git a/spec/github/client/authorizations/delete_spec.rb b/spec/github/client/authorizations/delete_spec.rb
@@ -6,20 +6,18 @@
   let(:basic_auth) { 'login:password' }
   let(:host)       { "https://#{basic_auth}@api.github.com" }
 
-  before { subject.basic_auth = basic_auth }
-
-  after { reset_authentication_for(subject) }
+  subject { described_class.new(basic_auth: basic_auth) }
 
   context "when an user" do
     let(:authorization_id) { 1 }
     let(:request_path) { "/authorizations/#{authorization_id}" }
     let(:body) { '' }
     let(:status) { 204 }
 
-    before {
+    before do
       stub_delete(request_path, host).to_return(body: body, status: status,
         headers: {content_type: 'application/json; charset=utf-8'})
-    }
+    end
 
     it "fails to get resource without basic authentication" do
       reset_authentication_for subject
diff --git a/spec/github/client/authorizations/get_spec.rb b/spec/github/client/authorizations/get_spec.rb
@@ -2,20 +2,18 @@
 
 require 'spec_helper'
 
-describe Github::Client::Authorizations, '#get' do
+RSpec.describe Github::Client::Authorizations, '#get' do
   let(:basic_auth) { 'login:password' }
   let(:request_path) { "/authorizations/#{authorization_id}" }
   let(:host) { "https://#{basic_auth}@api.github.com" }
   let(:authorization_id) { 1 }
 
-  before {
-    stub_get(request_path, host).to_return(:body => body, :status => status,
-      :headers => {:content_type => "application/json; charset=utf-8"})
-  }
+  subject { described_class.new(basic_auth: basic_auth) }
 
-  before { subject.basic_auth = basic_auth }
-
-  after { reset_authentication_for(subject) }
+  before do
+    stub_get(request_path, host).to_return(body: body, status: status,
+      headers: {content_type: "application/json; charset=utf-8"})
+  end
 
   context "resource found" do
     let(:body) { fixture('auths/authorization.json') }
diff --git a/spec/github/client/authorizations/list_spec.rb b/spec/github/client/authorizations/list_spec.rb
@@ -2,19 +2,17 @@
 
 require 'spec_helper'
 
-describe Github::Client::Authorizations, '#list' do
+RSpec.describe Github::Client::Authorizations, '#list' do
   let(:basic_auth) { 'login:password' }
   let(:request_path) { "/authorizations" }
   let(:host) { "https://#{basic_auth}@api.github.com" }
 
-  before {
+  subject { described_class.new(basic_auth: basic_auth) }
+
+  before do
     stub_get(request_path, host).to_return(:body => body, :status => status,
       :headers => {:content_type => "application/json; charset=utf-8"})
-  }
-
-  before { subject.basic_auth = basic_auth }
-
-  after { reset_authentication_for(subject) }
+  end
 
   context "resource found" do
     let(:body) { fixture('auths/authorizations.json') }
diff --git a/spec/github/client/authorizations/update_spec.rb b/spec/github/client/authorizations/update_spec.rb
@@ -2,21 +2,19 @@
 
 require 'spec_helper'
 
-describe Github::Client::Authorizations, '#update' do
+RSpec.describe Github::Client::Authorizations, '#update' do
   let(:basic_auth) { 'login:password' }
   let(:request_path) { "/authorizations/#{authorization_id}" }
   let(:host) { "https://#{basic_auth}@api.github.com" }
   let(:authorization_id) { 1 }
   let(:inputs) { { :add_scopes => ['repo'] } }
 
-  before {
-    stub_patch(request_path, host).to_return(:body => body, :status => status,
-      :headers => {:content_type => "application/json; charset=utf-8"})
-  }
+  subject { described_class.new(basic_auth: basic_auth) }
 
-  before { subject.basic_auth = basic_auth }
-
-  after { reset_authentication_for(subject) }
+  before do
+    stub_patch(request_path, host).to_return(body: body, status: status,
+      headers: {content_type: "application/json; charset=utf-8"})
+  end
 
   context "resouce updated" do
     let(:body) { fixture('auths/authorization.json') }
