Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e34e5761
Commit
e34e5761
authored
Jun 06, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '33340-fix-broken-master' into 'master'
Fix Projects API spec Closes #33340 See merge request !11928
parents
1e671309
33fad62d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+2
-2
No files found.
spec/requests/api/projects_spec.rb
View file @
e34e5761
...
@@ -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
(
's
tart
ed'
)
expect
(
json_response
[
'import_status'
]).
to
eq
(
's
chedul
ed'
)
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
(
's
tart
ed'
)
expect
(
json_response
[
'import_status'
]).
to
eq
(
's
chedul
ed'
)
expect
(
json_response
).
to
include
(
"import_error"
)
expect
(
json_response
).
to
include
(
"import_error"
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment