travis 1.11.1 → 1.13.0

data/spec/client/session_spec.rb

@@ -1,165 +1,169 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::Session do
-  it { should be_a(Travis::Client::Methods) }
+  subject(:session) { described_class.new }
+
+  it { is_expected.to be_a(Travis::Client::Methods) }
 
-  describe "uri" do
-    its(:uri) { should be == "https://api.travis-ci.org/" }
+  describe 'uri' do
+    its(:uri) { is_expected.to be == 'https://api.travis-ci.com/' }
 
     it 'can be set as argument' do
-      Travis::Client::Session.new('http://foo/').uri.should be == 'http://foo/'
+      described_class.new('http://foo/').uri.should be == 'http://foo/'
     end
 
     it 'can be set as hash argument' do
-      Travis::Client::Session.new(:uri => 'http://foo/').uri.should be == 'http://foo/'
+      described_class.new(uri: 'http://foo/').uri.should be == 'http://foo/'
     end
   end
 
-  describe "access_token" do
-    its(:access_token) { should be_nil }
+  describe 'access_token' do
+    its(:access_token) { is_expected.to be_nil }
 
     it 'gives authenticated access if set' do
-      subject.access_token = 'token'
-      subject.user.login.should be == 'rkh'
+      session.access_token = 'token'
+      session.user.login.should be == 'rkh'
     end
 
     it 'raises if token is not set' do
-      expect { subject.user.login }.to raise_error(Travis::Client::Error)
+      expect { session.user.login }.to raise_error(Travis::Client::Error)
     end
   end
 
-  describe "connection" do
-    its(:connection) { should be_a(Faraday::Connection) }
+  describe 'connection' do
+    its(:connection) { is_expected.to be_a(Faraday::Connection) }
 
     it 'creates a new connection when changing the uri' do
-      old_connection = subject.connection
-      subject.uri    = 'http://localhost:3000'
-      subject.connection.should_not be == old_connection
+      old_connection = session.connection
+      session.uri    = 'http://localhost:3000'
+      session.connection.should_not be == old_connection
     end
   end
 
-  describe "headers" do
+  describe 'headers' do
     it 'propagates headers to connection headers' do
-      subject.headers['foo'] = 'bar'
-      subject.connection.headers.should include('foo')
+      session.headers['foo'] = 'bar'
+      session.connection.headers.should include('foo')
     end
 
     it 'propagates headers to new connections' do
-      subject.headers['foo'] = 'bar'
-      subject.connection = Faraday::Connection.new
-      subject.connection.headers.should include('foo')
+      session.headers['foo'] = 'bar'
+      session.connection = Faraday::Connection.new
+      session.connection.headers.should include('foo')
     end
 
     it 'is possible to set headers as constructor option' do
-      Travis::Client::Session.new(:headers => {'foo' => 'bar'}, :uri => 'http://localhost:3000/').
-        connection.headers['foo'].should be == 'bar'
+      described_class.new(headers: { 'foo' => 'bar' }, uri: 'http://localhost:3000/')
+                     .connection.headers['foo'].should be == 'bar'
     end
 
     it 'sets a User-Agent' do
-      subject.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
-      subject.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
-      subject.headers['User-Agent'].should include("Rack/#{Rack.version}")
-      subject.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
+      session.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
+      session.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
+      session.headers['User-Agent'].should include("Rack/#{Rack.version}")
+      session.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
     end
 
     it 'allows adding custom info to the User-Agent' do
-      subject.agent_info = "foo"
-      subject.headers['User-Agent'].should include("foo")
-      subject.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
-      subject.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
-      subject.headers['User-Agent'].should include("Rack/#{Rack.version}")
-      subject.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
+      session.agent_info = 'foo'
+      session.headers['User-Agent'].should include('foo')
+      session.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
+      session.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
+      session.headers['User-Agent'].should include("Rack/#{Rack.version}")
+      session.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
     end
   end
 
-  describe "find_one" do
+  describe 'find_one' do
     it 'finds one instance' do
-      repo = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      repo = session.find_one(Travis::Client::Repository, 'rails/rails')
       repo.should be_a(Travis::Client::Repository)
       repo.slug.should be == 'rails/rails'
     end
   end
 
-  describe "find_many" do
+  describe 'find_many' do
     it 'finds many instances' do
-      repos = subject.find_many(Travis::Client::Repository)
+      repos = session.find_many(Travis::Client::Repository)
       repos.should be_an(Array)
       repos.each { |repo| repo.should be_a(Travis::Client::Repository) }
-      repos.first.slug.should be == "pypug/django-mango"
+      repos.first.slug.should be == 'pypug/django-mango'
     end
   end
 
-  describe "find_one_or_many" do
+  describe 'find_one_or_many' do
     it 'finds one instance' do
-      subject.access_token = 'token'
-      subject.find_one_or_many(Travis::Client::User).should be_a(Travis::Client::User)
+      session.access_token = 'token'
+      session.find_one_or_many(Travis::Client::User).should be_a(Travis::Client::User)
     end
 
     it 'finds many instances' do
-      subject.find_one_or_many(Travis::Client::Repository).should be_an(Array)
+      session.find_one_or_many(Travis::Client::Repository).should be_an(Array)
     end
   end
 
-  describe "reload" do
+  describe 'reload' do
     it 'reloads an instance' do
-      Travis::Client::Session::FakeAPI.rails_description = "Ruby on Rails"
-      rails = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      Travis::Client::Session::FakeAPI.rails_description = 'Ruby on Rails'
+      rails = session.find_one(Travis::Client::Repository, 'rails/rails')
       rails.description.should be == 'Ruby on Rails'
       Travis::Client::Session::FakeAPI.rails_description = 'Rails on the Rubies'
       rails.description.should be == 'Ruby on Rails'
-      subject.reload(rails)
+      session.reload(rails)
       rails.description.should be == 'Rails on the Rubies'
     end
   end
 
-  describe "get" do
+  describe 'get' do
     it 'fetches a payload and substitutes values with entities' do
-      result = subject.get('/repos/')
-      result['repos'].first.slug.should be == "pypug/django-mango"
+      result = session.get('/repos/')
+      result['repos'].first.slug.should be == 'pypug/django-mango'
     end
   end
 
-  describe "clear_cache" do
+  describe 'clear_cache' do
     it 'resets all the entities' do
-      Travis::Client::Session::FakeAPI.rails_description = "Ruby on Rails"
-      rails = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      Travis::Client::Session::FakeAPI.rails_description = 'Ruby on Rails'
+      rails = session.find_one(Travis::Client::Repository, 'rails/rails')
       rails.description.should be == 'Ruby on Rails'
       Travis::Client::Session::FakeAPI.rails_description = 'Rails on the Rubies'
       rails.description.should be == 'Ruby on Rails'
-      subject.clear_cache
+      session.clear_cache
       rails.description.should be == 'Rails on the Rubies'
     end
 
     it 'keeps entries in the identity map' do
-      rails = subject.repo('rails/rails')
-      subject.clear_cache
-      subject.repo('rails/rails').should be_equal(rails)
+      rails = session.repo('rails/rails')
+      session.clear_cache
+      session.repo('rails/rails').should be_equal(rails)
     end
   end
 
-  describe "clear_cache!" do
+  describe 'clear_cache!' do
     it 'resets all the entities' do
-      Travis::Client::Session::FakeAPI.rails_description = "Ruby on Rails"
-      rails = subject.find_one(Travis::Client::Repository, 'rails/rails')
+      Travis::Client::Session::FakeAPI.rails_description = 'Ruby on Rails'
+      rails = session.find_one(Travis::Client::Repository, 'rails/rails')
       rails.description.should be == 'Ruby on Rails'
       Travis::Client::Session::FakeAPI.rails_description = 'Rails on the Rubies'
       rails.description.should be == 'Ruby on Rails'
-      subject.clear_cache!
+      session.clear_cache!
       rails.description.should be == 'Rails on the Rubies'
     end
 
     it 'does not keep entries in the identity map' do
-      rails = subject.repo('rails/rails')
-      subject.clear_cache!
-      subject.repo('rails/rails').should_not be_equal(rails)
+      rails = session.repo('rails/rails')
+      session.clear_cache!
+      session.repo('rails/rails').should_not be_equal(rails)
     end
   end
 
-  describe "session" do
-    its(:session) { should eq(subject) }
+  describe 'session' do
+    its(:session) { is_expected.to eq(session) }
   end
 
-  describe "config" do
-    its(:config) { should be == {"host" => "travis-ci.org"}}
+  describe 'config' do
+    its(:config) { is_expected.to be == { 'host' => 'travis-ci.org' } }
   end
 end

data/spec/client/user_spec.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client::User do
   # attributes :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes
-  subject { Travis::Client.new(:access_token => 'token').user }
-  its(:login) { should be == 'rkh' }
-  its(:name) { should be == 'Konstantin Haase' }
-  its(:email) { should be == 'konstantin.haase@gmail.com' }
-  its(:gravatar_id) { should be == '5c2b452f6eea4a6d84c105ebd971d2a4' }
-  its(:locale) { should be == 'en' }
-  its(:is_syncing) { should be false }
-  its(:synced_at) { should be_a(Time) }
+  subject { Travis::Client.new(access_token: 'token').user }
+
+  its(:login) { is_expected.to be == 'rkh' }
+  its(:name) { is_expected.to be == 'Konstantin Haase' }
+  its(:email) { is_expected.to be == 'konstantin.haase@gmail.com' }
+  its(:gravatar_id) { is_expected.to be == '5c2b452f6eea4a6d84c105ebd971d2a4' }
+  its(:locale) { is_expected.to be == 'en' }
+  its(:is_syncing) { is_expected.to be false }
+  its(:synced_at) { is_expected.to be_a(Time) }
 
-  it { should_not be_syncing }
-  it { should be_correct_scopes }
+  it { is_expected.not_to be_syncing }
+  it { is_expected.to be_correct_scopes }
 end

data/spec/client_spec.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Client do
-  its(:new) { should be_a(Travis::Client::Session) }
+  its(:new) { is_expected.to be_a(Travis::Client::Session) }
 
   it 'accepts string argument' do
-    Travis::Client.new('http://foo/').uri.should be == 'http://foo/'
+    described_class.new('http://foo/').uri.should be == 'http://foo/'
   end
 
   it 'accepts options hash with string keys' do
-    Travis::Client.new('uri' => 'http://foo/').uri.should be == 'http://foo/'
+    described_class.new('uri' => 'http://foo/').uri.should be == 'http://foo/'
   end
 
   it 'accepts options hash with symbol keys' do
-    Travis::Client.new(:uri => 'http://foo/').uri.should be == 'http://foo/'
+    described_class.new(uri: 'http://foo/').uri.should be == 'http://foo/'
   end
 end

data/spec/pro_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::Pro do
-  it { should be_a(Travis::Client::Namespace) }
-  its(:api_endpoint) { should be == 'https://api.travis-ci.com/' }
+  it { is_expected.to be_a(Travis::Client::Namespace) }
+  its(:api_endpoint) { is_expected.to be == 'https://api.travis-ci.com/' }
 
   it 'has a nice inspect on entities' do
-    Travis::Pro::Repository.find('rails/rails').inspect.should be == "#<Travis::Pro::Repository: rails/rails>"
+    Travis::Pro::Repository.find('rails/rails').inspect.should be == '#<Travis::Pro::Repository: rails/rails>'
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'support/fake_api'
 require 'support/fake_github'
 require 'support/helpers'
@@ -21,7 +23,7 @@ RSpec.configure do |c|
     temp_dir = File.expand_path('travis-spec', Dir.tmpdir)
     FileUtils.rm_rf(temp_dir)
     FileUtils.mkdir_p(temp_dir)
-    ENV.delete_if { |k,v| k.start_with? "TRAVIS_" }
+    ENV.delete_if { |k, _v| k.start_with? 'TRAVIS_' }
     ENV['TRAVIS_CONFIG_PATH'] = File.expand_path('travis', temp_dir)
   end