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
a3daceab
Commit
a3daceab
authored
Feb 13, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix JSON schemas related issues
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
6cce4d18
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
2 deletions
+3
-2
.flayignore
.flayignore
+1
-0
ee/spec/fixtures/api/schemas/environment.json
ee/spec/fixtures/api/schemas/environment.json
+1
-1
spec/controllers/projects/environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+1
-1
spec/fixtures/api/schemas/deployment.json
spec/fixtures/api/schemas/deployment.json
+0
-0
No files found.
.flayignore
View file @
a3daceab
...
...
@@ -19,3 +19,4 @@ app/models/project_services/kubernetes_service.rb
ee/db/**/*
ee/app/serializers/ee/merge_request_widget_entity.rb
ee/lib/ee/gitlab/ldap/sync/admin_users.rb
ee/spec/**/*
ee/spec/fixtures/api/schemas/environment.json
View file @
a3daceab
...
...
@@ -32,7 +32,7 @@
"last_deployment"
:
{
"oneOf"
:
[
{
"$ref"
:
"deployment.json"
"$ref"
:
"
../../../../../spec/fixtures/api/schemas/
deployment.json"
},
{
"type"
:
[
"null"
]
...
...
spec/controllers/projects/environments_controller_spec.rb
View file @
a3daceab
...
...
@@ -60,7 +60,7 @@ describe Projects::EnvironmentsController do
end
it
'responds with matching schema'
do
expect
(
response
).
to
match_response_schema
(
'environments'
)
expect
(
response
).
to
match_response_schema
(
'environments'
,
dir:
'ee'
)
end
it
'responds with a payload describing available environments'
do
...
...
ee/
spec/fixtures/api/schemas/deployment.json
→
spec/fixtures/api/schemas/deployment.json
View file @
a3daceab
File moved
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