From bf39c4bcdf64b656323a07e2f26079148f3a43c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Wed, 9 Nov 2016 19:21:52 +0100 Subject: Remove order-dependent expectation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- spec/requests/api/labels_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 2ff90b6deac..5d84976c9c3 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -15,7 +15,7 @@ describe API::API, api: true do describe 'GET /projects/:id/labels' do it 'returns all available labels to the project' do group = create(:group) - group_label = create(:group_label, group: group) + group_label = create(:group_label, title: 'feature', group: group) project.update(group: group) expected_keys = [ 'id', 'name', 'color', 'description', -- cgit v1.2.1 From 84ac742fa6caf6e525e690d6f929f8931902fb9b Mon Sep 17 00:00:00 2001 From: Francesco Coda Zabetta Date: Mon, 14 Nov 2016 15:52:43 +0100 Subject: fix labels API adding missing parameter (current_user) --- spec/requests/api/labels_spec.rb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 5d84976c9c3..39fe6e64653 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -17,6 +17,8 @@ describe API::API, api: true do group = create(:group) group_label = create(:group_label, title: 'feature', group: group) project.update(group: group) + create(:labeled_issue, project: project, labels: [group_label], author: user) + create(:labeled_issue, project: project, labels: [label1], author: user, state: :closed) expected_keys = [ 'id', 'name', 'color', 'description', 'open_issues_count', 'closed_issues_count', 'open_merge_requests_count', @@ -30,14 +32,24 @@ describe API::API, api: true do expect(json_response.size).to eq(3) expect(json_response.first.keys).to match_array expected_keys expect(json_response.map { |l| l['name'] }).to match_array([group_label.name, priority_label.name, label1.name]) - expect(json_response.last['name']).to eq(label1.name) - expect(json_response.last['color']).to be_present - expect(json_response.last['description']).to be_nil - expect(json_response.last['open_issues_count']).to eq(0) - expect(json_response.last['closed_issues_count']).to eq(0) - expect(json_response.last['open_merge_requests_count']).to eq(0) - expect(json_response.last['priority']).to be_nil - expect(json_response.last['subscribed']).to be_falsey + + label1_response = json_response.select{|l| l['name'] == label1.title}.first + group_label_response = json_response.select{|l| l['name'] == group_label.title}.first + priority_label_response = json_response.select{|l| l['name'] == priority_label.title}.first + + expect(label1_response['open_issues_count']).to eq(0) + expect(label1_response['closed_issues_count']).to eq(1) + expect(group_label_response['open_issues_count']).to eq(1) + expect(group_label_response['closed_issues_count']).to eq(0) + expect(priority_label_response['open_issues_count']).to eq(0) + expect(priority_label_response['closed_issues_count']).to eq(0) + + expect(label1_response['name']).to eq(label1.name) + expect(label1_response['color']).to be_present + expect(label1_response['description']).to be_nil + expect(label1_response['open_merge_requests_count']).to eq(0) + expect(label1_response['priority']).to be_nil + expect(label1_response['subscribed']).to be_falsey end end -- cgit v1.2.1 From d5981dd44db4b36ad3d6b5005cd942bc295ace58 Mon Sep 17 00:00:00 2001 From: Francesco Coda Zabetta Date: Mon, 14 Nov 2016 16:05:39 +0100 Subject: fix style --- spec/requests/api/labels_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 39fe6e64653..9f0500bd443 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -33,9 +33,9 @@ describe API::API, api: true do expect(json_response.first.keys).to match_array expected_keys expect(json_response.map { |l| l['name'] }).to match_array([group_label.name, priority_label.name, label1.name]) - label1_response = json_response.select{|l| l['name'] == label1.title}.first - group_label_response = json_response.select{|l| l['name'] == group_label.title}.first - priority_label_response = json_response.select{|l| l['name'] == priority_label.title}.first + label1_response = json_response.select{ |l| l['name'] == label1.title }.first + group_label_response = json_response.select{ |l| l['name'] == group_label.title }.first + priority_label_response = json_response.select{ |l| l['name'] == priority_label.title }.first expect(label1_response['open_issues_count']).to eq(0) expect(label1_response['closed_issues_count']).to eq(1) -- cgit v1.2.1 From c57c83336d8dc8b4cb82e51cd40b72795bdf01bf Mon Sep 17 00:00:00 2001 From: Francesco Coda Zabetta Date: Mon, 14 Nov 2016 16:15:53 +0100 Subject: fix style --- spec/requests/api/labels_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 9f0500bd443..64a99e42c28 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -33,9 +33,9 @@ describe API::API, api: true do expect(json_response.first.keys).to match_array expected_keys expect(json_response.map { |l| l['name'] }).to match_array([group_label.name, priority_label.name, label1.name]) - label1_response = json_response.select{ |l| l['name'] == label1.title }.first - group_label_response = json_response.select{ |l| l['name'] == group_label.title }.first - priority_label_response = json_response.select{ |l| l['name'] == priority_label.title }.first + label1_response = json_response.select { |l| l['name'] == label1.title }.first + group_label_response = json_response.select { |l| l['name'] == group_label.title }.first + priority_label_response = json_response.select { |l| l['name'] == priority_label.title }.first expect(label1_response['open_issues_count']).to eq(0) expect(label1_response['closed_issues_count']).to eq(1) -- cgit v1.2.1 From a58e2f4762d8f0fc52b0a4dc5a65c28258603c11 Mon Sep 17 00:00:00 2001 From: Francesco Coda Zabetta Date: Tue, 15 Nov 2016 09:50:39 +0100 Subject: use Enumerable#find insted of select + first --- spec/requests/api/labels_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 64a99e42c28..151b5c33e3a 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -33,9 +33,9 @@ describe API::API, api: true do expect(json_response.first.keys).to match_array expected_keys expect(json_response.map { |l| l['name'] }).to match_array([group_label.name, priority_label.name, label1.name]) - label1_response = json_response.select { |l| l['name'] == label1.title }.first - group_label_response = json_response.select { |l| l['name'] == group_label.title }.first - priority_label_response = json_response.select { |l| l['name'] == priority_label.title }.first + label1_response = json_response.find { |l| l['name'] == label1.title } + group_label_response = json_response.find { |l| l['name'] == group_label.title } + priority_label_response = json_response.find { |l| l['name'] == priority_label.title } expect(label1_response['open_issues_count']).to eq(0) expect(label1_response['closed_issues_count']).to eq(1) -- cgit v1.2.1 From 8966c6e33daec5480f19149d2a6102107833afe0 Mon Sep 17 00:00:00 2001 From: Francesco Coda Zabetta Date: Tue, 15 Nov 2016 11:45:57 +0100 Subject: add tests --- spec/requests/api/labels_spec.rb | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 151b5c33e3a..77dfebf1a98 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -19,6 +19,8 @@ describe API::API, api: true do project.update(group: group) create(:labeled_issue, project: project, labels: [group_label], author: user) create(:labeled_issue, project: project, labels: [label1], author: user, state: :closed) + create(:labeled_merge_request, labels: [priority_label], author: user, source_project: project ) + expected_keys = [ 'id', 'name', 'color', 'description', 'open_issues_count', 'closed_issues_count', 'open_merge_requests_count', @@ -39,17 +41,30 @@ describe API::API, api: true do expect(label1_response['open_issues_count']).to eq(0) expect(label1_response['closed_issues_count']).to eq(1) - expect(group_label_response['open_issues_count']).to eq(1) - expect(group_label_response['closed_issues_count']).to eq(0) - expect(priority_label_response['open_issues_count']).to eq(0) - expect(priority_label_response['closed_issues_count']).to eq(0) - + expect(label1_response['open_merge_requests_count']).to eq(0) expect(label1_response['name']).to eq(label1.name) expect(label1_response['color']).to be_present expect(label1_response['description']).to be_nil - expect(label1_response['open_merge_requests_count']).to eq(0) expect(label1_response['priority']).to be_nil expect(label1_response['subscribed']).to be_falsey + + expect(group_label_response['open_issues_count']).to eq(1) + expect(group_label_response['closed_issues_count']).to eq(0) + expect(group_label_response['open_merge_requests_count']).to eq(0) + expect(group_label_response['name']).to eq(group_label.name) + expect(group_label_response['color']).to be_present + expect(group_label_response['description']).to be_nil + expect(group_label_response['priority']).to be_nil + expect(group_label_response['subscribed']).to be_falsey + + expect(priority_label_response['open_issues_count']).to eq(0) + expect(priority_label_response['closed_issues_count']).to eq(0) + expect(priority_label_response['open_merge_requests_count']).to eq(1) + expect(priority_label_response['name']).to eq(priority_label.name) + expect(priority_label_response['color']).to be_present + expect(priority_label_response['description']).to be_nil + expect(priority_label_response['priority']).to eq(3) + expect(priority_label_response['subscribed']).to be_falsey end end -- cgit v1.2.1 From 0c052f116c9e093936847280e833ca8985d2d94c Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Fri, 4 Nov 2016 16:19:08 -0200 Subject: Remove default value for `project` argument on subscribable concern --- spec/requests/api/labels_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 77dfebf1a98..aaf41639277 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -339,7 +339,7 @@ describe API::API, api: true do end context "when user is already subscribed to label" do - before { label1.subscribe(user) } + before { label1.subscribe(user, project) } it "returns 304" do post api("/projects/#{project.id}/labels/#{label1.id}/subscription", user) @@ -358,7 +358,7 @@ describe API::API, api: true do end describe "DELETE /projects/:id/labels/:label_id/subscription" do - before { label1.subscribe(user) } + before { label1.subscribe(user, project) } context "when label_id is a label title" do it "unsubscribes from the label" do @@ -381,7 +381,7 @@ describe API::API, api: true do end context "when user is already unsubscribed from label" do - before { label1.unsubscribe(user) } + before { label1.unsubscribe(user, project) } it "returns 304" do delete api("/projects/#{project.id}/labels/#{label1.id}/subscription", user) -- cgit v1.2.1 From eb4f15571d02634920b975e7ce2325572d88356e Mon Sep 17 00:00:00 2001 From: Livier Date: Wed, 23 Nov 2016 13:14:08 -0700 Subject: Changed API spec files to describe the correct class Restore changes for api spec files Fix error in rspec Users Delete extra space Repositories-spec --- spec/requests/api/labels_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/requests/api/labels_spec.rb') diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index aaf41639277..b29ce1ea25e 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API, api: true do +describe API::Labels, api: true do include ApiHelpers let(:user) { create(:user) } -- cgit v1.2.1