jira-ruby 3.0.0.beta1 → 3.0.0

data/spec/jira/resource/attachment_spec.rb

@@ -4,11 +4,13 @@ describe JIRA::Resource::Attachment do
   subject(:attachment) do
     described_class.new(
       client,
-      issue: JIRA::Resource::Issue.new(client),
-      attrs: { 'author' => { 'foo' => 'bar' } }
+      issue: JIRA::Resource::Issue.new(client, attrs: { 'id' => issue_id }),
+      attrs: { 'author' => { 'foo' => 'bar' }, 'id' => attachment_id }
     )
   end
 
+  let(:issue_id) { 27_676 }
+  let(:attachment_id) { 30_076 }
   let(:client) do
     double(
       'client',
@@ -44,13 +46,17 @@ describe JIRA::Resource::Attachment do
       )
     end
 
-    it 'returns meta information about attachment upload' do
-      expect(client).to receive(:get).with('/jira/rest/api/2/attachment/meta').and_return(response)
+    context 'when returning meta information' do
+      it 'returns meta information about attachment upload' do
+        expect(client).to receive(:get).with('/jira/rest/api/2/attachment/meta').and_return(response)
 
-      subject
+        result = subject
+
+        expect(result).to be_a(Hash)
+      end
     end
 
-    context 'the factory delegates correctly' do
+    context 'when the factory delegates correctly' do
       subject { JIRA::Resource::AttachmentFactory.new(client) }
 
       it 'delegates #meta to to target class' do
@@ -59,7 +65,7 @@ describe JIRA::Resource::Attachment do
     end
   end
 
-  context 'there is an attachment on an issue' do
+  context 'when there is an attachment on an issue' do
     subject(:attachment) do
       described_class.new(
         client,
@@ -68,22 +74,26 @@ describe JIRA::Resource::Attachment do
       )
     end
 
+    let(:attachment_url) { 'https://localhost:2990/secure/attachment/32323/myfile.txt' }
     let(:client) do
       JIRA::Client.new(username: 'username', password: 'password', auth_type: :basic, use_ssl: false)
     end
     let(:attachment_file_contents) { 'file contents' }
-    let(:attachment_url) { 'https://localhost:2990/secure/attachment/32323/myfile.txt' }
+    let(:issue_id) { 3232 }
+    let(:issue) { JIRA::Resource::Issue.new(client, attrs: { 'id' => issue_id }) }
 
     before do
       stub_request(:get, attachment_url).to_return(body: attachment_file_contents)
     end
 
     describe '.download_file' do
-      it 'passes file object to block' do
-        expect(URI).to receive(:parse).with(attachment_url).and_call_original
+      context 'when passing file object to block' do
+        it 'passes file object to block' do
+          expect(URI).to receive(:parse).with(attachment_url).and_call_original
 
-        attachment.download_file do |file|
-          expect(file.read).to eq(attachment_file_contents)
+          attachment.download_file do |file|
+            expect(file.read).to eq(attachment_file_contents)
+          end
         end
       end
     end
@@ -91,6 +101,7 @@ describe JIRA::Resource::Attachment do
     describe '.download_contents' do
       it 'downloads the file contents as a string' do
         expect(URI).to receive(:parse).with(attachment_url).and_call_original
+
         expect(attachment.download_contents).to eq(attachment_file_contents)
       end
     end
@@ -115,7 +126,7 @@ describe JIRA::Resource::Attachment do
         ].to_json
       )
     end
-    let(:issue) { JIRA::Resource::Issue.new(client) }
+    let(:issue) { JIRA::Resource::Issue.new(client, attrs: { 'id' => issue_id }) }
 
     describe '#save' do
       subject { attachment.save('file' => path_to_file) }
@@ -125,6 +136,8 @@ describe JIRA::Resource::Attachment do
       end
 
       it 'successfully update the attachment' do
+        expect(client).to receive(:post_multipart).and_return(response).with("/jira/rest/api/2/issue/#{issue.id}/attachments/#{attachment.id}", anything, anything)
+
         subject
 
         expect(attachment.filename).to eq file_name
@@ -225,4 +238,14 @@ describe JIRA::Resource::Attachment do
       end
     end
   end
+
+  context 'when an attachment is on an issue' do
+    describe '#delete' do
+      it 'removes the attachment' do
+        expect(client).to receive(:delete).with("/jira/rest/api/2/issue/#{issue_id}/attachments/#{attachment_id}")
+
+        attachment.delete
+      end
+    end
+  end
 end

data/spec/jira/resource/board_spec.rb

@@ -107,7 +107,7 @@ EOS
 
       context 'when there are multiple pages of results' do
         let(:result_1) do
-          OpenStruct.new(body: {
+          double(body: {
             'startAt' => 0,
             'maxResults' => 1,
             'total' => 2,
@@ -115,7 +115,7 @@ EOS
           }.to_json)
         end
         let(:result_2) do
-          OpenStruct.new(body: {
+          double(body: {
             'startAt' => 1,
             'maxResults' => 1,
             'total' => 2,
@@ -132,7 +132,7 @@ EOS
 
       context 'when there is only one page of results' do
         let(:result_1) do
-          OpenStruct.new(body: {
+          double(body: {
             'startAt' => 0,
             'maxResults' => 2,
             'total' => 2,
@@ -166,7 +166,7 @@ EOS
             }
         ]
     }
-EOS
+    EOS
     allow(response).to receive(:body).and_return(api_json)
     allow(board).to receive(:id).and_return(84)
     expect(client).to receive(:get).with('/rest/agile/1.0/board/84/sprint?').and_return(response)
@@ -215,7 +215,7 @@ EOS
           "rankCustomFieldId":10011
         }
       }
-EOS
+    EOS
     allow(response).to receive(:body).and_return(api_json)
     allow(board).to receive(:id).and_return(84)
     expect(client).to receive(:get).with('/rest/agile/1.0/board/84/configuration').and_return(response)

data/spec/jira/resource/field_spec.rb

@@ -1,56 +1,55 @@
 require 'spec_helper'
 
 describe JIRA::Resource::Field do
-  let(:cache) { OpenStruct.new }
-
   let(:client) do
     client = double(options: { rest_base_path: '/jira/rest/api/2' })
     field = JIRA::Resource::FieldFactory.new(client)
     allow(client).to receive(:Field).and_return(field)
-    allow(client).to receive(:cache).and_return(cache)
+    allow(client).to receive(:field_map_cache).and_return(nil)
+    allow(client).to receive(:field_map_cache=)
     # info about all fields on the client
     allow(client.Field).to receive(:all).and_return([
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'customfield_10666', 'name' => 'Priority', 'custom' => true, 'orderable' => true, 'navigable' => true,
-                                                                          'searchable' => true, 'clauseNames' => ['cf[10666]', 'Priority'], 'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_666 } }),
+                                                                                   'searchable' => true, 'clauseNames' => ['cf[10666]', 'Priority'], 'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_666 } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'issuekey', 'name' => 'Key', 'custom' => false, 'orderable' => false,
-                                                                          'navigable' => true, 'searchable' => false, 'clauseNames' => %w[id issue issuekey key] }),
+                                                                                   'navigable' => true, 'searchable' => false, 'clauseNames' => %w[id issue issuekey key] }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'priority', 'name' => 'Priority', 'custom' => false, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => ['priority'], 'schema' => { 'type' => 'priority', 'system' => 'priority' } }),
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => ['priority'], 'schema' => { 'type' => 'priority', 'system' => 'priority' } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'summary', 'name' => 'Summary', 'custom' => false, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => ['summary'], 'schema' => { 'type' => 'string', 'system' => 'summary' } }),
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => ['summary'], 'schema' => { 'type' => 'string', 'system' => 'summary' } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'issuetype', 'name' => 'Issue Type', 'custom' => false, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => %w[issuetype type], 'schema' => { 'type' => 'issuetype', 'system' => 'issuetype' } }),
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => %w[issuetype type], 'schema' => { 'type' => 'issuetype', 'system' => 'issuetype' } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'customfield_10111', 'name' => 'SingleWord', 'custom' => true, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10111]', 'SingleWord'],       'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_111 } }),
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10111]', 'SingleWord'],       'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_111 } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'customfield_10222', 'name' => 'Multi Word', 'custom' => true, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10222]', 'Multi Word'],       'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_222 } }),
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10222]', 'Multi Word'],       'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_222 } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'customfield_10333', 'name' => 'Why/N@t', 'custom' => true, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10333]', 'Why/N@t'],          'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_333 } }),
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10333]', 'Why/N@t'],          'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_333 } }),
                                                       described_class.new(client,
                                                                           attrs: { 'id' => 'customfield_10444', 'name' => 'SingleWord', 'custom' => true, 'orderable' => true,
-                                                                          'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10444]', 'SingleWord'],       'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_444 } })
+                                                                                   'navigable' => true, 'searchable' => true, 'clauseNames' => ['cf[10444]', 'SingleWord'],       'schema' => { 'type' => 'string', 'custom' => 'com.atlassian.jira.plugin.system.customfieldtypes:select', 'customId' => 10_444 } })
                                                     ])
     client
   end
 
   describe 'field_mappings' do
-    shared_context 'mapped or not' do
+    shared_context 'with or without mapping' do
       subject do
         described_class.new(client, attrs: {
                               'priority' => 1,
-                                    'customfield_10111' => 'data_in_custom_field',
-                                    'customfield_10222' => 'multi word custom name',
-                                    'customfield_10333' => 'complex custom name',
-                                    'customfield_10444' => 'duplicated custom name',
-                                    'customfield_10666' => 'duplicate of a system name'
+                              'customfield_10111' => 'data_in_custom_field',
+                              'customfield_10222' => 'multi word custom name',
+                              'customfield_10333' => 'complex custom name',
+                              'customfield_10444' => 'duplicated custom name',
+                              'customfield_10666' => 'duplicate of a system name'
                             })
       end
 
@@ -65,12 +64,12 @@ describe JIRA::Resource::Field do
       it 'is not confused by common attribute keys' do
         expect { subject.name }.to raise_error(NoMethodError)
         expect { subject.custom }.to raise_error(NoMethodError)
-        expect(subject.id).to eq(nil)   # picks up ID from the parent -
+        expect(subject.id).to be_nil   # picks up ID from the parent -
       end
     end
 
-    context 'before fields are mapped' do
-      include_context 'mapped or not'
+    context 'when fields are not yet mapped' do
+      include_context 'with or without mapping'
 
       it 'can find a standard field by id' do
         expect(subject.priority).to eq(1)
@@ -87,12 +86,12 @@ describe JIRA::Resource::Field do
       it 'is not confused by common attribute keys and raises error' do
         expect { subject.name }.to raise_error(NoMethodError)
         expect { subject.custom }.to raise_error(NoMethodError)
-        expect(subject.id).to eq(nil)   # picks up ID from the parent -
+        expect(subject.id).to be_nil   # picks up ID from the parent -
       end
     end
 
-    context 'after fields are mapped' do
-      include_context 'mapped or not'
+    context 'when fields have been mapped' do
+      include_context 'with or without mapping'
 
       it 'warns of duplicate fields' do
         expect { client.Field.map_fields }.to output(/renaming as Priority_10666/).to_stderr

data/spec/jira/resource/filter_spec.rb

@@ -28,7 +28,7 @@ describe JIRA::Resource::Filter do
       owner: jira_user,
       jql: '"Git Repository" ~ jira-ruby AND status = Resolved',
       viewUrl: 'https://localhost/secure/IssueNavigator.jspa?mode=hide&requestId=42',
-      searchUrl: 'https://localhost/rest/api/2/search?jql=%22Git+Repository%22+~+jira-ruby+AND+status+%3D+Resolved',
+      searchUrl: 'https://localhost/rest/api/2/search/jql?jql=%22Git+Repository%22+~+jira-ruby+AND+status+%3D+Resolved',
       favourite: false,
       sharePermissions: [
         {
@@ -69,6 +69,7 @@ describe JIRA::Resource::Filter do
       startAt: 0,
       maxResults: 50,
       total: 2,
+      isLast: true,
       issues: [jql_issue]
     }
   end
@@ -86,7 +87,7 @@ describe JIRA::Resource::Filter do
     expect(filter).to be_present
     allow(client).to receive(:options).and_return(rest_base_path: 'localhost')
     expect(client).to receive(:get)
-      .with("localhost/search?jql=#{CGI.escape(filter.jql)}")
+      .with("localhost/search/jql?jql=#{CGI.escape(filter.jql)}")
       .and_return(issue_jql_response)
     issues = filter.issues
     expect(issues).to be_an(Array)

data/spec/jira/resource/issue_spec.rb

@@ -7,7 +7,7 @@ describe JIRA::Resource::Issue do
   let(:client) do
     client = double(options: { rest_base_path: '/jira/rest/api/2' })
     allow(client).to receive(:Field).and_return(JIRA::Resource::FieldFactory.new(client))
-    allow(client).to receive(:cache).and_return(OpenStruct.new)
+    allow(client).to receive(:field_map_cache).and_return(nil)
     client
   end
 
@@ -25,7 +25,7 @@ describe JIRA::Resource::Issue do
       end
 
       it 'responds to key' do
-        expect(@decorated.respond_to?(:key)).to eq(true)
+        expect(@decorated.respond_to?(:key)).to be(true)
       end
 
       it 'does not raise an error' do
@@ -42,16 +42,16 @@ describe JIRA::Resource::Issue do
     issue = double
 
     allow(response).to receive(:body).and_return('{"issues":[{"id":"1","summary":"Bugs Everywhere"}]}')
-    expect(client).to receive(:get).with('/jira/rest/api/2/search?expand=transitions.fields&maxResults=1000&startAt=0')
+    expect(client).to receive(:get).with('/jira/rest/api/2/search/jql?expand=transitions.fields&maxResults=1000&startAt=0')
                                    .and_return(response)
     allow(empty_response).to receive(:body).and_return('{"issues":[]}')
-    expect(client).to receive(:get).with('/jira/rest/api/2/search?expand=transitions.fields&maxResults=1000&startAt=1')
+    expect(client).to receive(:get).with('/jira/rest/api/2/search/jql?expand=transitions.fields&maxResults=1000&startAt=1')
                                    .and_return(empty_response)
 
     expect(client).to receive(:Issue).and_return(issue)
     expect(issue).to receive(:build).with({ 'id' => '1', 'summary' => 'Bugs Everywhere' })
 
-    issues = described_class.all(client)
+    described_class.all(client)
   end
 
   it 'finds an issue by key or id' do
@@ -70,85 +70,107 @@ describe JIRA::Resource::Issue do
     expect(issue_from_id.attrs).to eq(issue_from_key.attrs)
   end
 
-  it 'searches an issue with a jql query string' do
-    response = double
-    issue = double
+  describe '.jql' do
+    subject { described_class.jql(client, 'foo bar', args) }
 
-    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)
-    expect(client).to receive(:Issue).and_return(issue)
-    expect(issue).to receive(:build).with(%w[key foo]).and_return('')
+    let(:args) { {} }
+    let(:issue) { double }
+    let(:response) { double }
+    let(:response_string) { '{"issues": {"key":"foo"}, "isLast": true}' }
 
-    expect(described_class.jql(client, 'foo bar')).to eq([''])
-  end
+    before do
+      allow(response).to receive(:body).and_return(response_string)
+      allow(client).to receive(:Issue).and_return(issue)
+      allow(issue).to receive(:build).with(%w[key foo]).and_return('')
+    end
 
-  it 'searches an issue with a jql query string and fields' do
-    response = double
-    issue = double
+    it 'searches an issue with a jql query string' do
+      expect(client).to receive(:get).with('/jira/rest/api/2/search/jql?jql=foo+bar')
+                                     .and_return(response)
+      expect(described_class.jql(client, 'foo bar')).to eq([''])
+    end
 
-    allow(response).to receive(:body).and_return('{"issues": {"key":"foo"}}')
-    expect(client).to receive(:get)
-      .with('/jira/rest/api/2/search?jql=foo+bar&fields=foo,bar')
-      .and_return(response)
-    expect(client).to receive(:Issue).and_return(issue)
-    expect(issue).to receive(:build).with(%w[key foo]).and_return('')
+    it 'passes thorugh the reconcileIssues parameter' do
+      expect(client).to receive(:get)
+        .with('/jira/rest/api/2/search/jql?jql=foo+bar&reconcileIssues=true')
+        .and_return(response)
 
-    expect(described_class.jql(client, 'foo bar', fields: %w[foo bar])).to eq([''])
-  end
+      expect(described_class.jql(client, 'foo bar', reconcile_issues: true)).to eq([''])
+    end
 
-  it 'searches an issue with a jql query string, start at, and maxResults' do
-    response = double
-    issue = double
+    it 'searches an issue with a jql query string and fields' do
+      expect(client).to receive(:get)
+        .with('/jira/rest/api/2/search/jql?jql=foo+bar&fields=foo,bar')
+        .and_return(response)
 
-    allow(response).to receive(:body).and_return('{"issues": {"key":"foo"}}')
-    expect(client).to receive(:get)
-      .with('/jira/rest/api/2/search?jql=foo+bar&startAt=1&maxResults=3')
-      .and_return(response)
-    expect(client).to receive(:Issue).and_return(issue)
-    expect(issue).to receive(:build).with(%w[key foo]).and_return('')
+      expect(described_class.jql(client, 'foo bar', fields: %w[foo bar])).to eq([''])
+    end
 
-    expect(described_class.jql(client, 'foo bar', start_at: 1, max_results: 3)).to eq([''])
-  end
+    context 'when maxResults is provided' do
+      let(:args) { { max_results: } }
 
-  it 'searches an issue with a jql query string and maxResults equals zero and should return the count of tickets' do
-    response = double
-    issue = double
+      context 'with non-zero' do
+        let(:max_results) { 3 }
 
-    allow(response).to receive(:body).and_return('{"total": 1, "issues": []}')
-    expect(client).to receive(:get)
-      .with('/jira/rest/api/2/search?jql=foo+bar&maxResults=0')
-      .and_return(response)
+        it 'searches an issue with a jql query string and maxResults' do
+          expect(client).to receive(:get)
+            .with('/jira/rest/api/2/search/jql?jql=foo+bar&maxResults=3')
+            .and_return(response)
 
-    expect(described_class.jql(client, 'foo bar', max_results: 0)).to eq(1)
-  end
+          expect(subject).to eq([''])
+        end
+      end
 
-  it 'searches an issue with a jql query string and string expand' do
-    response = double
-    issue = double
+      context 'with zero' do
+        let(:response_string) { '{"total": 1, "issues": []}' }
+        let(:max_results) { 0 }
 
-    allow(response).to receive(:body).and_return('{"issues": {"key":"foo"}}')
-    expect(client).to receive(:get)
-      .with('/jira/rest/api/2/search?jql=foo+bar&expand=transitions')
-      .and_return(response)
-    expect(client).to receive(:Issue).and_return(issue)
-    expect(issue).to receive(:build).with(%w[key foo]).and_return('')
+        it 'searches an issue with a jql query string and should return the count of tickets' do
+          expect(client).to receive(:get)
+            .with('/jira/rest/api/2/search/jql?jql=foo+bar&maxResults=0')
+            .and_return(response)
 
-    expect(described_class.jql(client, 'foo bar', expand: 'transitions')).to eq([''])
-  end
+          expect(subject).to eq(1)
+        end
+      end
+    end
 
-  it 'searches an issue with a jql query string and array expand' do
-    response = double
-    issue = double
+    it 'searches an issue with a jql query string and string expand' do
+      expect(client).to receive(:get)
+        .with('/jira/rest/api/2/search/jql?jql=foo+bar&expand=transitions')
+        .and_return(response)
 
-    allow(response).to receive(:body).and_return('{"issues": {"key":"foo"}}')
-    expect(client).to receive(:get)
-      .with('/jira/rest/api/2/search?jql=foo+bar&expand=transitions')
-      .and_return(response)
-    expect(client).to receive(:Issue).and_return(issue)
-    expect(issue).to receive(:build).with(%w[key foo]).and_return('')
+      expect(described_class.jql(client, 'foo bar', expand: 'transitions')).to eq([''])
+    end
+
+    it 'searches an issue with a jql query string and array expand' do
+      expect(client).to receive(:get)
+        .with('/jira/rest/api/2/search/jql?jql=foo+bar&expand=transitions')
+        .and_return(response)
+
+      expect(described_class.jql(client, 'foo bar', expand: %w[transitions])).to eq([''])
+    end
+
+    context 'when pagination is required' do
+      let(:response_string) { '{"issues": [{"key":"foo"}], "isLast": false, "nextPageToken": "abc"}' }
+      let(:second_response_string) { '{"issues": [{"key":"bar"}], "isLast": true}' }
 
-    expect(described_class.jql(client, 'foo bar', expand: %w[transitions])).to eq([''])
+      before do
+        allow(issue).to receive(:build).with({ 'key' => 'foo' }).and_return('1')
+        allow(issue).to receive(:build).with({ 'key' => 'bar' }).and_return('2')
+      end
+
+      it 'makes multiple requests' do
+        expect(client).to receive(:get)
+          .with('/jira/rest/api/2/search/jql?jql=foo+bar')
+          .and_return(response)
+        expect(client).to receive(:get)
+          .with('/jira/rest/api/2/search/jql?jql=foo+bar&nextPageToken=abc')
+          .and_return(double(body: second_response_string))
+
+        expect(subject).to eq(%w[1 2])
+      end
+    end
   end
 
   it 'returns meta data available for editing an issue' do
@@ -175,20 +197,20 @@ describe JIRA::Resource::Issue do
     subject do
       described_class.new(client, attrs: {
                             'id' => '123',
-                                  'fields' => {
-                                    'reporter' => { 'foo' => 'bar' },
-                                    'assignee' => { 'foo' => 'bar' },
-                                    'project' => { 'foo' => 'bar' },
-                                    'priority' => { 'foo' => 'bar' },
-                                    'issuetype' => { 'foo' => 'bar' },
-                                    'status' => { 'foo' => 'bar' },
-                                    'resolution' => { 'foo' => 'bar' },
-                                    'components' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
-                                    'versions' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
-                                    'comment' => { 'comments' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }] },
-                                    'attachment' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
-                                    'worklog' => { 'worklogs' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }] }
-                                  }
+                            'fields' => {
+                              'reporter' => { 'foo' => 'bar' },
+                              'assignee' => { 'foo' => 'bar' },
+                              'project' => { 'foo' => 'bar' },
+                              'priority' => { 'foo' => 'bar' },
+                              'issuetype' => { 'foo' => 'bar' },
+                              'status' => { 'foo' => 'bar' },
+                              'resolution' => { 'foo' => 'bar' },
+                              'components' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
+                              'versions' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
+                              'comment' => { 'comments' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }] },
+                              'attachment' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
+                              'worklog' => { 'worklogs' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }] }
+                            }
                           })
     end
 

data/spec/jira/resource/project_spec.rb

@@ -11,8 +11,8 @@ describe JIRA::Resource::Project do
     subject do
       described_class.new(client, attrs: {
                             'lead' => { 'foo' => 'bar' },
-                                    'issueTypes' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
-                                    'versions' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }]
+                            'issueTypes' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }],
+                            'versions' => [{ 'foo' => 'bar' }, { 'baz' => 'flum' }]
                           })
     end
 
@@ -36,13 +36,13 @@ describe JIRA::Resource::Project do
     end
 
     it 'returns issues' do
-      response_body = '{"expand":"schema,names","startAt":0,"maxResults":1,"total":1,"issues":[{"expand":"editmeta,renderedFields,transitions,changelog,operations","id":"53062","self":"/rest/api/2/issue/53062","key":"test key","fields":{"summary":"test summary"}}]}' # rubocop:disable Layout/LineLength
+      response_body = '{"expand":"schema,names","startAt":0,"maxResults":1,"total":1,"issues":[{"expand":"editmeta,renderedFields,transitions,changelog,operations","id":"53062","self":"/rest/api/2/issue/53062","key":"test key","fields":{"summary":"test summary"}}]}'
       response = double('response',
                         body: response_body)
       issue_factory = double('issue factory')
 
       expect(client).to receive(:get)
-        .with('/jira/rest/api/2/search?jql=project%3D%22test%22')
+        .with('/jira/rest/api/2/search/jql?jql=project%3D%22test%22')
         .and_return(response)
       expect(client).to receive(:Issue).and_return(issue_factory)
       expect(issue_factory).to receive(:build)
@@ -52,13 +52,13 @@ describe JIRA::Resource::Project do
 
     context 'with changelog' do
       it 'returns issues' do
-        response_body = '{"expand":"schema,names","startAt":0,"maxResults":1,"total":1,"issues":[{"expand":"editmeta,renderedFields,transitions,changelog,operations","id":"53062","self":"/rest/api/2/issue/53062","key":"test key","fields":{"summary":"test summary"},"changelog":{}}]}' # rubocop:disable Layout/LineLength
+        response_body = '{"expand":"schema,names","startAt":0,"maxResults":1,"total":1,"issues":[{"expand":"editmeta,renderedFields,transitions,changelog,operations","id":"53062","self":"/rest/api/2/issue/53062","key":"test key","fields":{"summary":"test summary"},"changelog":{}}]}'
         response = double('response',
                           body: response_body)
         issue_factory = double('issue factory')
 
         expect(client).to receive(:get)
-          .with('/jira/rest/api/2/search?jql=project%3D%22test%22&expand=changelog&startAt=1&maxResults=100')
+          .with('/jira/rest/api/2/search/jql?jql=project%3D%22test%22&expand=changelog&startAt=1&maxResults=100')
           .and_return(response)
         expect(client).to receive(:Issue).and_return(issue_factory)
         expect(issue_factory).to receive(:build)
@@ -73,7 +73,7 @@ describe JIRA::Resource::Project do
     let(:project_key) { SecureRandom.hex }
     let(:response) { double('response', body: '[{}]') }
 
-    context 'pagination' do
+    context 'with pagination' do
       before do
         user_factory = double('user factory')
         expect(client).to receive(:User).and_return(user_factory)
@@ -113,7 +113,7 @@ describe JIRA::Resource::Project do
         max_results = rand(1000)
 
         expect(client).to receive(:get)
-          .with("/jira/rest/api/2/user/assignable/search?project=#{project_key}&startAt=#{start_at}&maxResults=#{max_results}") # rubocop:disable Layout/LineLength
+          .with("/jira/rest/api/2/user/assignable/search?project=#{project_key}&startAt=#{start_at}&maxResults=#{max_results}")
           .and_return(response)
 
         project.users(start_at:, max_results:)