Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-02-14 13:48:12 +0300
committerRémy Coutable <remy@rymai.me>2019-02-14 13:48:12 +0300
commited7144ad58c32936c902d93da23eeb2159ee0158 (patch)
tree57c9860525d4861c766045dce092b766853125fa /spec/requests/api/labels_spec.rb
parent8becfd9092df9ecd87c39f2bd7fe61428d1c5242 (diff)
parentcc8b8ec08f176dfdad71f8efdf92ebd512664c3d (diff)
Merge branch '56694-mark-group-level-labels-in-label-api-as-such' into 'master'
Mark group-level labels in Label API as such. Closes #56694 See merge request gitlab-org/gitlab-ce!25219
Diffstat (limited to 'spec/requests/api/labels_spec.rb')
-rw-r--r--spec/requests/api/labels_spec.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
index 606fa9185d8..518181e4d93 100644
--- a/spec/requests/api/labels_spec.rb
+++ b/spec/requests/api/labels_spec.rb
@@ -22,7 +22,7 @@ describe API::Labels do
expected_keys = %w(
id name color text_color description
open_issues_count closed_issues_count open_merge_requests_count
- subscribed priority
+ subscribed priority is_project_label
)
get api("/projects/#{project.id}/labels", user)
@@ -47,6 +47,7 @@ describe API::Labels do
expect(label1_response['description']).to be_nil
expect(label1_response['priority']).to be_nil
expect(label1_response['subscribed']).to be_falsey
+ expect(label1_response['is_project_label']).to be_truthy
expect(group_label_response['open_issues_count']).to eq(1)
expect(group_label_response['closed_issues_count']).to eq(0)
@@ -57,6 +58,7 @@ describe API::Labels do
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(group_label_response['is_project_label']).to be_falsey
expect(priority_label_response['open_issues_count']).to eq(0)
expect(priority_label_response['closed_issues_count']).to eq(0)
@@ -67,6 +69,7 @@ describe API::Labels do
expect(priority_label_response['description']).to be_nil
expect(priority_label_response['priority']).to eq(3)
expect(priority_label_response['subscribed']).to be_falsey
+ expect(priority_label_response['is_project_label']).to be_truthy
end
end