Commit e34e5761 authored by Sean McGivern's avatar Sean McGivern

Merge branch '33340-fix-broken-master' into 'master'

Fix Projects API spec

Closes #33340

See merge request !11928
parents 1e671309 33fad62d
...@@ -1480,7 +1480,7 @@ describe API::Projects do ...@@ -1480,7 +1480,7 @@ describe API::Projects do
expect(json_response['owner']['id']).to eq(user2.id) expect(json_response['owner']['id']).to eq(user2.id)
expect(json_response['namespace']['id']).to eq(user2.namespace.id) expect(json_response['namespace']['id']).to eq(user2.namespace.id)
expect(json_response['forked_from_project']['id']).to eq(project.id) expect(json_response['forked_from_project']['id']).to eq(project.id)
expect(json_response['import_status']).to eq('started') expect(json_response['import_status']).to eq('scheduled')
expect(json_response).to include("import_error") expect(json_response).to include("import_error")
end end
...@@ -1493,7 +1493,7 @@ describe API::Projects do ...@@ -1493,7 +1493,7 @@ describe API::Projects do
expect(json_response['owner']['id']).to eq(admin.id) expect(json_response['owner']['id']).to eq(admin.id)
expect(json_response['namespace']['id']).to eq(admin.namespace.id) expect(json_response['namespace']['id']).to eq(admin.namespace.id)
expect(json_response['forked_from_project']['id']).to eq(project.id) expect(json_response['forked_from_project']['id']).to eq(project.id)
expect(json_response['import_status']).to eq('started') expect(json_response['import_status']).to eq('scheduled')
expect(json_response).to include("import_error") expect(json_response).to include("import_error")
end 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