diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-06 11:36:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-06 11:36:39 +0000 |
| commit | e34e5761042579686fe149f16e7ec107b80224d2 (patch) | |
| tree | 507ab73bbb03a541e0b9b4c5f66ea826dbd12c46 | |
| parent | 1e671309a32d38b8dfd99cb3cbbe35dcbd0cbc9e (diff) | |
| parent | 33fad62d8e13921c765f446fe4d03b2b13f24404 (diff) | |
| download | gitlab-ce-e34e5761042579686fe149f16e7ec107b80224d2.tar.gz | |
Merge branch '33340-fix-broken-master' into 'master'
Fix Projects API spec
Closes #33340
See merge request !11928
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 5c13cea69fb..c0ecb4d2aaa 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -1480,7 +1480,7 @@ describe API::Projects do expect(json_response['owner']['id']).to eq(user2.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['import_status']).to eq('started') + expect(json_response['import_status']).to eq('scheduled') expect(json_response).to include("import_error") end @@ -1493,7 +1493,7 @@ describe API::Projects do expect(json_response['owner']['id']).to eq(admin.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['import_status']).to eq('started') + expect(json_response['import_status']).to eq('scheduled') expect(json_response).to include("import_error") end |