jira-ruby 2.2.0 → 3.0.0.beta1

data/spec/jira/resource/user_factory_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe JIRA::Resource::UserFactory do
+  subject { described_class.new(client) }
+
   let(:client) do
     instance_double('Client', options: { rest_base_path: '/jira/rest/api/2' })
   end
 
-  subject { JIRA::Resource::UserFactory.new(client) }
-
   describe '#myself' do
     let(:response) do
       instance_double(
-        'Response', body: get_mock_response('user_username=admin.json')
+        'Response', body: get_mock_response('user_accountId=1234567890abcdef01234567.json')
       )
     end
 
     let(:user) { subject.myself }
 
-    before(:each) do
+    before do
       allow(client).to receive(:get).with(
         '/jira/rest/api/2/myself'
       ).and_return(response)

data/spec/jira/resource/worklog_spec.rb

@@ -5,10 +5,10 @@ describe JIRA::Resource::Worklog do
 
   describe 'relationships' do
     subject do
-      JIRA::Resource::Worklog.new(client, issue_id: '99999', attrs: {
-                                    'author' => { 'foo' => 'bar' },
+      described_class.new(client, issue_id: '99999', attrs: {
+                            'author' => { 'foo' => 'bar' },
                                     'updateAuthor' => { 'foo' => 'bar' }
-                                  })
+                          })
     end
 
     it 'has the correct relationships' do

data/spec/mock_responses/sprint/1.json

@@ -0,0 +1,13 @@
+{
+    "id": 1,
+    "self": "https://localhost:2990/jira/rest/agile/1.0/sprint/1",
+    "state": "closed",
+    "name": "SP Sprint 1",
+    "startDate": "2024-01-01T03:20:00.000Z",
+    "endDate": "2024-01-15T03:20:00.000Z",
+    "completeDate": "2024-01-16T03:48:00.000Z",
+    "createdDate": "2024-01-01T00:00:00.000Z",
+    "originBoardId": 1,
+    "goal": "",
+    "rapidview_id": 1
+}

data/spec/mock_responses/status/1.json

@@ -3,5 +3,12 @@
   "description": "The issue is open and ready for the assignee to start work on it.",
   "iconUrl": "http://localhost:2990/jira/images/icons/status_open.gif",
   "name": "Open",
-  "id": "1"
+  "id": "1",
+  "statusCategory": {
+    "self": "http://localhost:2990/jira/rest/api/2/statuscategory/2",
+    "id": 2,
+    "key": "new",
+    "colorName": "blue-gray",
+    "name": "To Do"
+  }
 }

data/spec/mock_responses/status.json

@@ -4,34 +4,69 @@
     "description": "The issue is open and ready for the assignee to start work on it.",
     "iconUrl": "http://localhost:2990/jira/images/icons/status_open.gif",
     "name": "Open",
-    "id": "1"
+    "id": "1",
+    "statusCategory": {
+      "self": "http://localhost:2990/jira/rest/api/2/statuscategory/2",
+      "id": 2,
+      "key": "new",
+      "colorName": "blue-gray",
+      "name": "To Do"
+    }
   },
   {
     "self": "http://localhost:2990/jira/rest/api/2/status/3",
     "description": "This issue is being actively worked on at the moment by the assignee.",
     "iconUrl": "http://localhost:2990/jira/images/icons/status_inprogress.gif",
     "name": "In Progress",
-    "id": "3"
+    "id": "3",
+    "statusCategory": {
+      "self": "http://localhost:2990/jira/rest/api/2/statuscategory/4",
+      "id": 4,
+      "key": "indeterminate",
+      "colorName": "yellow",
+      "name": "In Progress"
+    }
   },
   {
     "self": "http://localhost:2990/jira/rest/api/2/status/4",
     "description": "This issue was once resolved, but the resolution was deemed incorrect. From here issues are either marked assigned or resolved.",
     "iconUrl": "http://localhost:2990/jira/images/icons/status_reopened.gif",
     "name": "Reopened",
-    "id": "4"
+    "id": "4",
+    "statusCategory": {
+      "self": "http://localhost:2990/jira/rest/api/2/statuscategory/2",
+      "id": 2,
+      "key": "new",
+      "colorName": "blue-gray",
+      "name": "To Do"
+    }
   },
   {
     "self": "http://localhost:2990/jira/rest/api/2/status/5",
     "description": "A resolution has been taken, and it is awaiting verification by reporter. From here issues are either reopened, or are closed.",
     "iconUrl": "http://localhost:2990/jira/images/icons/status_resolved.gif",
     "name": "Resolved",
-    "id": "5"
+    "id": "5",
+    "statusCategory": {
+      "self": "http://localhost:2990/jira/rest/api/2/statuscategory/3",
+      "id": 3,
+      "key": "done",
+      "colorName": "green",
+      "name": "Done"
+    }
   },
   {
     "self": "http://localhost:2990/jira/rest/api/2/status/6",
     "description": "The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.",
     "iconUrl": "http://localhost:2990/jira/images/icons/status_closed.gif",
     "name": "Closed",
-    "id": "6"
+    "id": "6",
+    "statusCategory": {
+      "self": "http://localhost:2990/jira/rest/api/2/statuscategory/3",
+      "id": 3,
+      "key": "done",
+      "colorName": "green",
+      "name": "Done"
+    }
   }
 ]

data/spec/mock_responses/statuscategory/1.json

@@ -0,0 +1,7 @@
+{
+  "self": "http://localhost:2990/jira/rest/api/2/statuscategory/1",
+  "id": 1,
+  "key": "undefined",
+  "colorName": "medium-gray",
+  "name": "No Category"
+}

data/spec/mock_responses/statuscategory.json

@@ -0,0 +1,30 @@
+[
+  {
+    "self": "http://localhost:2990/jira/rest/api/2/statuscategory/1",
+    "id": 1,
+    "key": "undefined",
+    "colorName": "medium-gray",
+    "name": "No Category"
+  },
+  {
+    "self": "http://localhost:2990/jira/rest/api/2/statuscategory/2",
+    "id": 2,
+    "key": "new",
+    "colorName": "blue-gray",
+    "name": "To Do"
+  },
+  {
+    "self": "http://localhost:2990/jira/rest/api/2/statuscategory/4",
+    "id": 4,
+    "key": "indeterminate",
+    "colorName": "yellow",
+    "name": "In Progress"
+  },
+  {
+    "self": "http://localhost:2990/jira/rest/api/2/statuscategory/3",
+    "id": 3,
+    "key": "done",
+    "colorName": "green",
+    "name": "Done"
+  }
+]

data/spec/mock_responses/{user_username=admin.json → user_accountId=1234567890abcdef01234567.json}

@@ -1,5 +1,6 @@
 {
-  "self": "http://localhost:2990/jira/rest/api/2/user?username=admin",
+  "id": "1234567890abcdef01234567",
+  "self": "http://localhost:2990/jira/rest/api/2/user?accountId=1234567890abcdef01234567",
   "name": "admin",
   "emailAddress": "admin@example.com",
   "avatarUrls": {

data/spec/spec_helper.rb

@@ -17,5 +17,6 @@ def get_mock_response(file, value_if_file_not_found = false)
   File.read(File.join(File.dirname(__FILE__), 'mock_responses/', file))
 rescue Errno::ENOENT => e
   raise e if value_if_file_not_found == false
+
   value_if_file_not_found
 end

data/spec/support/clients_helper.rb

@@ -1,5 +1,5 @@
 module ClientsHelper
-  def with_each_client
+  def with_each_client(&block)
     clients = {}
 
     oauth_client = JIRA::Client.new(consumer_key: 'foo', consumer_secret: 'bar')
@@ -7,10 +7,8 @@ module ClientsHelper
     clients['http://localhost:2990'] = oauth_client
 
     basic_client = JIRA::Client.new(username: 'foo', password: 'bar', auth_type: :basic, use_ssl: false)
-    clients['http://foo:bar@localhost:2990'] = basic_client
+    clients['http://localhost:2990'] = basic_client
 
-    clients.each do |site_url, client|
-      yield site_url, client
-    end
+    clients.each(&block)
   end
 end

data/spec/support/shared_examples/integration.rb

@@ -2,7 +2,7 @@ require 'cgi'
 
 def get_mock_from_path(method, options = {})
   prefix = if defined? belongs_to
-             belongs_to.path_component + '/'
+             "#{belongs_to.path_component}/"
            else
              ''
            end
@@ -15,8 +15,8 @@ def get_mock_from_path(method, options = {})
           described_class.collection_path(client, prefix)
         end
   file_path = url.sub(client.options[:rest_base_path], '')
-  file_path = file_path + '.' + options[:suffix] if options[:suffix]
-  file_path = file_path + '.' + method.to_s unless method == :get
+  file_path = "#{file_path}.#{options[:suffix]}" if options[:suffix]
+  file_path = "#{file_path}.#{method}" unless method == :get
   value_if_not_found = options.key?(:value_if_not_found) ? options[:value_if_not_found] : false
   get_mock_response("#{file_path}.json", value_if_not_found)
 end
@@ -33,7 +33,7 @@ end
 
 def prefix
   prefix = '/'
-  prefix = belongs_to.path_component + '/' if defined? belongs_to
+  prefix = "#{belongs_to.path_component}/" if defined? belongs_to
   prefix
 end
 
@@ -47,22 +47,22 @@ end
 
 shared_examples 'a resource' do
   it 'gracefully handles non-json responses' do
-    if defined? target
-      subject = target
-    else
-      subject = client.send(class_basename).build(described_class.key_attribute.to_s => '99999')
-    end
+    subject = if defined? target
+                target
+              else
+                client.send(class_basename).build(described_class.key_attribute.to_s => '99999')
+              end
     stub_request(:put, site_url + subject.url)
       .to_return(status: 405, body: '<html><body>Some HTML</body></html>')
     expect(subject.save('foo' => 'bar')).to be_falsey
-    expect(lambda do
+    expect do
       expect(subject.save!('foo' => 'bar')).to be_falsey
-    end).to raise_error(JIRA::HTTPError)
+    end.to raise_error(JIRA::HTTPError)
   end
 end
 
 shared_examples 'a resource with a collection GET endpoint' do
-  it 'should get the collection' do
+  it 'gets the collection' 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
@@ -73,13 +73,10 @@ shared_examples 'a resource with a collection GET endpoint' do
 end
 
 shared_examples 'a resource with JQL inputs and a collection GET endpoint' do
-  it 'should get the collection' do
+  it 'gets the collection' do
     stub_request(
       :get,
-      site_url +
-        client.options[:rest_base_path] +
-        '/search?jql=' +
-        CGI.escape(jql_query_string)
+      "#{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)
@@ -94,7 +91,7 @@ shared_examples 'a resource with a singular GET endpoint' do
     # E.g., for JIRA::Resource::Project, we need to call
     # client.Project.find()
     stub_request(:get, site_url + described_class.singular_path(client, key, prefix))
-      .to_return(status: 200, body: get_mock_from_path(:get, key: key))
+      .to_return(status: 200, body: get_mock_from_path(:get, key:))
     subject = client.send(class_basename).find(key, options)
 
     expect(subject).to have_attributes(expected_attributes)
@@ -104,7 +101,7 @@ shared_examples 'a resource with a singular GET endpoint' do
     # E.g., for JIRA::Resource::Project, we need to call
     # client.Project.build('key' => 'ABC123')
     stub_request(:get, site_url + described_class.singular_path(client, key, prefix))
-      .to_return(status: 200, body: get_mock_from_path(:get, key: key))
+      .to_return(status: 200, body: get_mock_from_path(:get, key:))
 
     subject = build_receiver.build(described_class.key_attribute.to_s => key)
     subject.fetch
@@ -114,10 +111,10 @@ shared_examples 'a resource with a singular GET endpoint' do
 
   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": {}}')
-    expect(lambda do
+      .to_return(status: 404, body: "{\"errorMessages\":[\"#{class_basename} Does Not Exist\"],\"errors\": {}}")
+    expect do
       client.send(class_basename).find('99999', options)
-    end).to raise_exception(JIRA::HTTPError)
+    end.to raise_exception(JIRA::HTTPError)
   end
 end
 
@@ -148,9 +145,9 @@ end
 shared_examples 'a resource with a PUT endpoint' do
   it 'saves an existing component' do
     stub_request(:get, site_url + described_class.singular_path(client, key, prefix))
-      .to_return(status: 200, body: get_mock_from_path(:get, key: key))
+      .to_return(status: 200, body: get_mock_from_path(:get, key:))
     stub_request(:put, site_url + described_class.singular_path(client, key, prefix))
-      .to_return(status: 200, body: get_mock_from_path(:put, key: key, value_if_not_found: nil))
+      .to_return(status: 200, body: get_mock_from_path(:put, key:, value_if_not_found: nil))
     subject = build_receiver.build(described_class.key_attribute.to_s => key)
     subject.fetch
     expect(subject.save(attributes_for_put)).to be_truthy
@@ -163,15 +160,15 @@ end
 shared_examples 'a resource with a PUT endpoint that rejects invalid fields' do
   it 'fails to save with an invalid field' do
     stub_request(:get, site_url + described_class.singular_path(client, key))
-      .to_return(status: 200, body: get_mock_from_path(:get, key: key))
+      .to_return(status: 200, body: get_mock_from_path(:get, key:))
     stub_request(:put, site_url + described_class.singular_path(client, key))
-      .to_return(status: 400, body: get_mock_from_path(:put, key: key, suffix: 'invalid'))
+      .to_return(status: 400, body: get_mock_from_path(:put, key:, suffix: 'invalid'))
     subject = client.send(class_basename).build(described_class.key_attribute.to_s => key)
     subject.fetch
 
     expect(subject.save('fields' => { 'invalid' => 'field' })).to be_falsey
-    expect(lambda do
+    expect do
       subject.save!('fields' => { 'invalid' => 'field' })
-    end).to raise_error(JIRA::HTTPError)
+    end.to raise_error(JIRA::HTTPError)
   end
 end