jira-ruby 0.1.10 → 0.1.11

data/spec/jira/request_client_spec.rb

@@ -4,9 +4,9 @@ describe JIRA::RequestClient do
 
   it "raises an exception for non success responses" do
     response = double()
-    response.stub(:kind_of?).with(Net::HTTPSuccess).and_return(false)
+    allow(response).to receive(:kind_of?).with(Net::HTTPSuccess).and_return(false)
     rc = JIRA::RequestClient.new
-    rc.should_receive(:make_request).with(:get, '/foo', '', {}).and_return(response)
+    expect(rc).to receive(:make_request).with(:get, '/foo', '', {}).and_return(response)
     expect {
       rc.request(:get, '/foo', '', {})
     }.to raise_exception(JIRA::HTTPError)

data/spec/jira/resource/attachment_spec.rb

@@ -12,8 +12,8 @@ describe JIRA::Resource::Attachment do
     }
 
     it "has the correct relationships" do
-      subject.should have_one(:author, JIRA::Resource::User)
-      subject.author.foo.should == 'bar'
+      expect(subject).to have_one(:author, JIRA::Resource::User)
+      expect(subject.author.foo).to eq('bar')
     end
   end
 

data/spec/jira/resource/filter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe JIRA::Resource::Filter do
   let(:client) do
     client = double()
-    client.stub(:Issue) { JIRA::Resource::IssueFactory.new(self) }
+    allow(client).to receive(:Issue).and_return(JIRA::Resource::IssueFactory.new(self))
     client
   end
   let(:collection_path) { '/rest/api/2/filter' }
@@ -44,12 +44,12 @@ describe JIRA::Resource::Filter do
   end
   let(:filter_response) do
     response = double()
-    response.stub(:body).and_return(filter_attrs.to_json)
+    allow(response).to receive(:body).and_return(filter_attrs.to_json)
     response
   end
   let(:filter) do
-    client.should_receive(:get).with("#{collection_path}/42").and_return(filter_response)
-    JIRA::Resource::Filter.stub(:collection_path).and_return(collection_path)
+    expect(client).to receive(:get).with("#{collection_path}/42").and_return(filter_response)
+    allow(JIRA::Resource::Filter).to receive(:collection_path).and_return(collection_path)
     JIRA::Resource::Filter.find(client, 42)
   end
   let(:jql_issue) do
@@ -74,7 +74,7 @@ describe JIRA::Resource::Filter do
   end
   let(:issue_jql_response) do
     response = double()
-    response.stub(:body).and_return(jql_attrs.to_json)
+    allow(response).to receive(:body).and_return(jql_attrs.to_json)
     response
   end
 
@@ -84,8 +84,8 @@ describe JIRA::Resource::Filter do
 
   it "returns issues" do
     expect(filter).to be_present
-    client.stub(:options) { { :rest_base_path => 'localhost' } }
-    client.should_receive(:get).
+    allow(client).to receive(:options).and_return({ :rest_base_path => 'localhost' })
+    expect(client).to receive(:get).
       with("localhost/search?jql=#{CGI.escape(filter.jql)}").
       and_return(issue_jql_response)
     issues = filter.issues

data/spec/jira/resource/issue_spec.rb

@@ -6,47 +6,47 @@ describe JIRA::Resource::Issue do
 
   it "should find an issue by key or id" do
     response = double()
-    response.stub(:body).and_return('{"key":"foo","id":"101"}')
-    JIRA::Resource::Issue.stub(:collection_path).and_return('/jira/rest/api/2/issue')
-    client.should_receive(:get).with('/jira/rest/api/2/issue/foo').
+    allow(response).to receive(:body).and_return('{"key":"foo","id":"101"}')
+    allow(JIRA::Resource::Issue).to receive(:collection_path).and_return('/jira/rest/api/2/issue')
+    expect(client).to receive(:get).with('/jira/rest/api/2/issue/foo').
       and_return(response)
-    client.should_receive(:get).with('/jira/rest/api/2/issue/101').
+    expect(client).to receive(:get).with('/jira/rest/api/2/issue/101').
       and_return(response)
 
     issue_from_id = JIRA::Resource::Issue.find(client,101)
     issue_from_key = JIRA::Resource::Issue.find(client,'foo')
 
-    issue_from_id.attrs.should == issue_from_key.attrs
+    expect(issue_from_id.attrs).to eq(issue_from_key.attrs)
   end
 
   it "should search an issue with a jql query string" do
     response = double()
     issue = double()
-    response.stub(:body).and_return('{"issues": {"key":"foo"}}')
-    client.should_receive(:get).with('/jira/rest/api/2/search?jql=foo+bar').
+    allow(response).to receive(:body).and_return('{"issues": {"key":"foo"}}')
+    expect(client).to receive(:get).with('/jira/rest/api/2/search?jql=foo+bar').
       and_return(response)
-    client.should_receive(:Issue).and_return(issue)
-    issue.should_receive(:build).with(["key", "foo"]).and_return('')
+    expect(client).to receive(:Issue).and_return(issue)
+    expect(issue).to receive(:build).with(["key", "foo"]).and_return('')
 
-    JIRA::Resource::Issue.jql(client,'foo bar').should == ['']
+    expect(JIRA::Resource::Issue.jql(client,'foo bar')).to eq([''])
   end
 
   it "should search an issue with a jql query string and fields" do
     response = double()
     issue = double()
-    response.stub(:body).and_return('{"issues": {"key":"foo"}}')
-    client.should_receive(:get).with('/jira/rest/api/2/search?jql=foo+bar%26fields%3Dfoo%2Cbar').
+    allow(response).to receive(:body).and_return('{"issues": {"key":"foo"}}')
+    expect(client).to receive(:get).with('/jira/rest/api/2/search?jql=foo+bar%26fields%3Dfoo%2Cbar').
       and_return(response)
-    client.should_receive(:Issue).and_return(issue)
-    issue.should_receive(:build).with(["key", "foo"]).and_return('')
+    expect(client).to receive(:Issue).and_return(issue)
+    expect(issue).to receive(:build).with(["key", "foo"]).and_return('')
 
-    JIRA::Resource::Issue.jql(client,'foo bar',['foo','bar']).should == ['']
+    expect(JIRA::Resource::Issue.jql(client,'foo bar',['foo','bar'])).to eq([''])
   end
 
   it "provides direct accessors to the fields" do
     subject = JIRA::Resource::Issue.new(client, :attrs => {'fields' => {'foo' =>'bar'}})
-    subject.should respond_to(:foo)
-    subject.foo.should == 'bar'
+    expect(subject).to respond_to(:foo)
+    expect(subject.foo).to eq('bar')
   end
 
   describe "relationships" do
@@ -70,38 +70,38 @@ describe JIRA::Resource::Issue do
     }
 
     it "has the correct relationships" do
-      subject.should have_one(:reporter, JIRA::Resource::User)
-      subject.reporter.foo.should == 'bar'
+      expect(subject).to have_one(:reporter, JIRA::Resource::User)
+      expect(subject.reporter.foo).to eq('bar')
 
-      subject.should have_one(:assignee, JIRA::Resource::User)
-      subject.assignee.foo.should == 'bar'
+      expect(subject).to have_one(:assignee, JIRA::Resource::User)
+      expect(subject.assignee.foo).to eq('bar')
 
-      subject.should have_one(:project, JIRA::Resource::Project)
-      subject.project.foo.should == 'bar'
+      expect(subject).to have_one(:project, JIRA::Resource::Project)
+      expect(subject.project.foo).to eq('bar')
 
-      subject.should have_one(:issuetype, JIRA::Resource::Issuetype)
-      subject.issuetype.foo.should == 'bar'
+      expect(subject).to have_one(:issuetype, JIRA::Resource::Issuetype)
+      expect(subject.issuetype.foo).to eq('bar')
 
-      subject.should have_one(:priority, JIRA::Resource::Priority)
-      subject.priority.foo.should == 'bar'
+      expect(subject).to have_one(:priority, JIRA::Resource::Priority)
+      expect(subject.priority.foo).to eq('bar')
 
-      subject.should have_one(:status, JIRA::Resource::Status)
-      subject.status.foo.should == 'bar'
+      expect(subject).to have_one(:status, JIRA::Resource::Status)
+      expect(subject.status.foo).to eq('bar')
 
-      subject.should have_many(:components, JIRA::Resource::Component)
-      subject.components.length.should == 2
+      expect(subject).to have_many(:components, JIRA::Resource::Component)
+      expect(subject.components.length).to eq(2)
 
-      subject.should have_many(:comments, JIRA::Resource::Comment)
-      subject.comments.length.should == 2
+      expect(subject).to have_many(:comments, JIRA::Resource::Comment)
+      expect(subject.comments.length).to eq(2)
 
-      subject.should have_many(:attachments, JIRA::Resource::Attachment)
-      subject.attachments.length.should == 2
+      expect(subject).to have_many(:attachments, JIRA::Resource::Attachment)
+      expect(subject.attachments.length).to eq(2)
 
-      subject.should have_many(:versions, JIRA::Resource::Version)
-      subject.attachments.length.should == 2
+      expect(subject).to have_many(:versions, JIRA::Resource::Version)
+      expect(subject.attachments.length).to eq(2)
 
-      subject.should have_many(:worklogs, JIRA::Resource::Worklog)
-      subject.worklogs.length.should == 2
+      expect(subject).to have_many(:worklogs, JIRA::Resource::Worklog)
+      expect(subject.worklogs.length).to eq(2)
     end
   end
 end

data/spec/jira/resource/project_factory_spec.rb

@@ -6,8 +6,8 @@ describe JIRA::Resource::ProjectFactory do
   subject       { JIRA::Resource::ProjectFactory.new(client) }
 
   it "initializes correctly" do
-    subject.class.should  == JIRA::Resource::ProjectFactory
-    subject.client.should == client
+    expect(subject.class).to eq(JIRA::Resource::ProjectFactory)
+    expect(subject.client).to eq(client)
   end
 
 end

data/spec/jira/resource/project_spec.rb

@@ -17,14 +17,14 @@ describe JIRA::Resource::Project do
     }
 
     it "has the correct relationships" do
-      subject.should have_one(:lead, JIRA::Resource::User)
-      subject.lead.foo.should == 'bar'
+      expect(subject).to have_one(:lead, JIRA::Resource::User)
+      expect(subject.lead.foo).to eq('bar')
 
-      subject.should have_many(:issuetypes, JIRA::Resource::Issuetype)
-      subject.issuetypes.length.should == 2
+      expect(subject).to have_many(:issuetypes, JIRA::Resource::Issuetype)
+      expect(subject.issuetypes.length).to eq(2)
 
-      subject.should have_many(:versions, JIRA::Resource::Version)
-      subject.versions.length.should == 2
+      expect(subject).to have_many(:versions, JIRA::Resource::Version)
+      expect(subject.versions.length).to eq(2)
     end
   end
 
@@ -41,11 +41,11 @@ describe JIRA::Resource::Project do
         :body => response_body)
       issue_factory = double("issue factory")
 
-      client.should_receive(:get)
+      expect(client).to receive(:get)
         .with('/jira/rest/api/2/search?jql=project%3D%22test%22')
         .and_return(response)
-      client.should_receive(:Issue).and_return(issue_factory)
-      issue_factory.should_receive(:build)
+      expect(client).to receive(:Issue).and_return(issue_factory)
+      expect(issue_factory).to receive(:build)
         .with(JSON.parse(response_body)["issues"][0])
       subject.issues
     end
@@ -57,11 +57,11 @@ describe JIRA::Resource::Project do
           :body => response_body)
         issue_factory = double("issue factory")
 
-        client.should_receive(:get)
+        expect(client).to receive(:get)
           .with('/jira/rest/api/2/search?jql=project%3D%22test%22&expand=changelog&startAt=1&maxResults=100')
           .and_return(response)
-        client.should_receive(:Issue).and_return(issue_factory)
-        issue_factory.should_receive(:build)
+        expect(client).to receive(:Issue).and_return(issue_factory)
+        expect(issue_factory).to receive(:build)
           .with(JSON.parse(response_body)["issues"][0])
         subject.issues({expand:'changelog', startAt:1, maxResults:100})
       end

data/spec/jira/resource/worklog_spec.rb

@@ -13,11 +13,11 @@ describe JIRA::Resource::Worklog do
     }
 
     it "has the correct relationships" do
-      subject.should have_one(:author, JIRA::Resource::User)
-      subject.author.foo.should == 'bar'
+      expect(subject).to have_one(:author, JIRA::Resource::User)
+      expect(subject.author.foo).to eq('bar')
 
-      subject.should have_one(:update_author, JIRA::Resource::User)
-      subject.update_author.foo.should == 'bar'
+      expect(subject).to have_one(:update_author, JIRA::Resource::User)
+      expect(subject.update_author.foo).to eq('bar')
     end
   end
 

data/spec/support/matchers/have_attributes.rb

@@ -1,11 +1,11 @@
 RSpec::Matchers.define :have_attributes do |expected|
   match do |actual|
     expected.each do |key, value|
-      actual.attrs[key].should == value
+      expect(actual.attrs[key]).to eq(value)
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected #{actual.attrs} to match #{expected}"
   end
 end

data/spec/support/matchers/have_many.rb

@@ -1,9 +1,9 @@
 RSpec::Matchers.define :have_many do |collection, klass|
   match do |actual|
-    actual.send(collection).class.should == JIRA::HasManyProxy
-    actual.send(collection).length.should > 0
+    expect(actual.send(collection).class).to eq(JIRA::HasManyProxy)
+    expect(actual.send(collection).length).to be > 0
     actual.send(collection).each do |member|
-      member.class.should == klass
+      expect(member.class).to eq(klass)
     end
   end
 end

data/spec/support/matchers/have_one.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :have_one do |resource, klass|
   match do |actual|
-    actual.send(resource).class.should == klass
+    expect(actual.send(resource).class).to eq(klass)
   end
 end

data/spec/support/shared_examples/integration.rb

@@ -59,10 +59,10 @@ shared_examples "a resource" do
     end
     stub_request(:put, site_url + subject.url).
                 to_return(:status => 405, :body => "<html><body>Some HTML</body></html>")
-    subject.save('foo' => 'bar').should be_false
-    lambda do
-      subject.save!('foo' => 'bar').should be_false
-    end.should raise_error(JIRA::HTTPError)
+    expect(subject.save('foo' => 'bar')).to be_falsey
+    expect(lambda do
+      expect(subject.save!('foo' => 'bar')).to be_falsey
+    end).to raise_error(JIRA::HTTPError)
   end
 
 end
@@ -73,10 +73,9 @@ shared_examples "a resource with a collection GET endpoint" do
     stub_request(:get, site_url + described_class.collection_path(client)).
                  to_return(:status => 200, :body => get_mock_from_path(:get))
     collection = build_receiver.all
-    collection.length.should == expected_collection_length
 
-    first = collection.first
-    first.should have_attributes(expected_attributes)
+    expect(collection.length).to eq(expected_collection_length)
+    expect(collection.first).to have_attributes(expected_attributes)
   end
 
 end
@@ -87,10 +86,9 @@ shared_examples "a resource with JQL inputs and a collection GET endpoint" do
     stub_request(:get, site_url + client.options[:rest_base_path] + '/search?jql=' + CGI.escape(jql_query_string)).
                  to_return(:status => 200, :body => get_mock_response('issue.json'))
     collection = build_receiver.jql(jql_query_string)
-    collection.length.should == expected_collection_length
 
-    first = collection.first
-    first.should have_attributes(expected_attributes)
+    expect(collection.length).to eq(expected_collection_length)
+    expect(collection.first).to have_attributes(expected_attributes)
   end
 
 end
@@ -104,7 +102,7 @@ shared_examples "a resource with a singular GET endpoint" do
                 to_return(:status => 200, :body => get_mock_from_path(:get, :key => key))
     subject = client.send(class_basename).find(key, options)
 
-    subject.should have_attributes(expected_attributes)
+    expect(subject).to have_attributes(expected_attributes)
   end
 
   it "builds and fetches a single resource" do
@@ -116,15 +114,15 @@ shared_examples "a resource with a singular GET endpoint" do
     subject = build_receiver.build(described_class.key_attribute.to_s => key)
     subject.fetch
 
-    subject.should have_attributes(expected_attributes)
+    expect(subject).to have_attributes(expected_attributes)
   end
 
   it "handles a 404" do
     stub_request(:get, site_url + described_class.singular_path(client, '99999', prefix)).
                 to_return(:status => 404, :body => '{"errorMessages":["'+class_basename+' Does Not Exist"],"errors": {}}')
-    lambda do
+    expect(   lambda do
       client.send(class_basename).find('99999', options)
-    end.should raise_exception(JIRA::HTTPError)
+    end).to raise_exception(JIRA::HTTPError)
   end
 end
 
@@ -136,7 +134,7 @@ shared_examples "a resource with a DELETE endpoint" do
                 to_return(:status => 204, :body => nil)
 
     subject = build_receiver.build(described_class.key_attribute.to_s => key)
-    subject.delete.should be_true
+    expect(subject.delete).to be_truthy
   end
 end
 
@@ -146,9 +144,9 @@ shared_examples "a resource with a POST endpoint" do
     stub_request(:post, site_url + described_class.collection_path(client, prefix)).
                 to_return(:status => 201, :body => get_mock_from_path(:post))
     subject = build_receiver.build
-    subject.save(attributes_for_post).should be_true
+    expect(subject.save(attributes_for_post)).to be_truthy
     expected_attributes_from_post.each do |method_name, value|
-      subject.send(method_name).should == value
+      expect(subject.send(method_name)).to eq(value)
     end
   end
 
@@ -163,9 +161,9 @@ shared_examples "a resource with a PUT endpoint" do
                   to_return(:status => 200, :body => get_mock_from_path(:put, :key => key, :value_if_not_found => nil))
     subject = build_receiver.build(described_class.key_attribute.to_s => key)
     subject.fetch
-    subject.save(attributes_for_put).should be_true
+    expect(subject.save(attributes_for_put)).to be_truthy
     expected_attributes_from_put.each do |method_name, value|
-      subject.send(method_name).should == value
+      expect(subject.send(method_name)).to eq(value)
     end
   end
 
@@ -181,10 +179,10 @@ shared_examples 'a resource with a PUT endpoint that rejects invalid fields' do
     subject = client.send(class_basename).build(described_class.key_attribute.to_s => key)
     subject.fetch
 
-    subject.save('fields'=> {'invalid' => 'field'}).should be_false
-    lambda do
+    expect(subject.save('fields'=> {'invalid' => 'field'})).to be_falsey
+    expect(lambda do
       subject.save!('fields'=> {'invalid' => 'field'})
-    end.should raise_error(JIRA::HTTPError)
+    end).to raise_error(JIRA::HTTPError)
   end
 
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: jira-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - SUMO Heavy Industries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 description: API for JIRA
 email: 
 executables: []