Commit 33879d1a authored by Nick Thomas's avatar Nick Thomas

Fix conflicts in specs

parent 9c5283de
......@@ -204,7 +204,6 @@ describe GroupPolicy, models: true do
expect_allowed(*reporter_permissions)
expect_allowed(*master_permissions)
expect_allowed(*owner_permissions)
<<<<<<< HEAD
end
end
......@@ -215,8 +214,6 @@ describe GroupPolicy, models: true do
is_expected.to be_allowed(:read_group)
is_expected.to be_disallowed(*master_permissions)
is_expected.to be_disallowed(*owner_permissions)
=======
>>>>>>> ce/master
end
end
end
......
......@@ -236,7 +236,6 @@ describe ProjectPolicy, models: true do
expect_allowed(*developer_permissions)
expect_allowed(*master_permissions)
expect_allowed(*owner_permissions)
<<<<<<< HEAD
end
end
......@@ -248,8 +247,6 @@ describe ProjectPolicy, models: true do
is_expected.to be_disallowed(*master_permissions)
is_expected.to be_disallowed(*owner_permissions)
is_expected.to be_allowed(*auditor_permissions)
=======
>>>>>>> ce/master
end
end
end
......
......@@ -93,7 +93,6 @@ describe ProjectSnippetPolicy, models: true do
it do
expect_allowed(:read_project_snippet)
expect_disallowed(*author_permissions)
<<<<<<< HEAD
end
end
......@@ -104,8 +103,6 @@ describe ProjectSnippetPolicy, models: true do
it do
is_expected.to be_disallowed(:read_project_snippet)
is_expected.to be_disallowed(*author_permissions)
=======
>>>>>>> ce/master
end
end
end
......@@ -163,7 +160,6 @@ describe ProjectSnippetPolicy, models: true do
it do
expect_allowed(:read_project_snippet)
expect_disallowed(*author_permissions)
<<<<<<< HEAD
end
end
......@@ -174,8 +170,6 @@ describe ProjectSnippetPolicy, models: true do
it do
is_expected.to be_allowed(:read_project_snippet)
is_expected.to be_disallowed(*author_permissions)
=======
>>>>>>> ce/master
end
end
......
......@@ -24,17 +24,11 @@ describe API::Namespaces do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
<<<<<<< HEAD
'parent_id', 'members_count_with_descendants',
'plan', 'shared_runners_minutes_limit')
expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
'parent_id', 'plan', 'shared_runners_minutes_limit')
=======
'parent_id', 'members_count_with_descendants')
expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
>>>>>>> ce/master
end
it "admin: returns an array of all namespaces" do
......@@ -67,11 +61,7 @@ describe API::Namespaces do
owned_group_response = json_response.find { |resource| resource['id'] == group1.id }
expect(owned_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
<<<<<<< HEAD
'plan', 'parent_id', 'members_count_with_descendants')
=======
'parent_id', 'members_count_with_descendants')
>>>>>>> ce/master
end
it "returns correct attributes when user cannot admin group" do
......
......@@ -749,12 +749,8 @@ describe API::Projects do
'path' => user.namespace.path,
'kind' => user.namespace.kind,
'full_path' => user.namespace.full_path,
<<<<<<< HEAD
'parent_id' => nil,
'plan' => nil
=======
'parent_id' => nil
>>>>>>> ce/master
})
end
......
......@@ -786,12 +786,8 @@ describe API::V3::Projects do
'path' => user.namespace.path,
'kind' => user.namespace.kind,
'full_path' => user.namespace.full_path,
<<<<<<< HEAD
'parent_id' => nil,
'plan' => nil
=======
'parent_id' => nil
>>>>>>> ce/master
})
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment