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
6d7078e7
Commit
6d7078e7
authored
Aug 10, 2021
by
Bala Kumar
Committed by
Shinya Maeda
Aug 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Use Same Endpoint for HTML and JSON in OperationsController"
parent
b8376928
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
640 additions
and
539 deletions
+640
-539
ee/app/controllers/operations_controller.rb
ee/app/controllers/operations_controller.rb
+40
-23
ee/app/helpers/ee/operations_helper.rb
ee/app/helpers/ee/operations_helper.rb
+4
-4
ee/app/serializers/dashboard_environments_project_entity.rb
ee/app/serializers/dashboard_environments_project_entity.rb
+1
-1
ee/config/routes/operations.rb
ee/config/routes/operations.rb
+6
-3
ee/spec/controllers/operations_controller_spec.rb
ee/spec/controllers/operations_controller_spec.rb
+524
-504
ee/spec/fixtures/api/schemas/dashboard/operations/environments.json
...xtures/api/schemas/dashboard/operations/environments.json
+0
-0
ee/spec/routing/operations_routing_spec.rb
ee/spec/routing/operations_routing_spec.rb
+61
-0
ee/spec/views/operations/environments.html.haml_spec.rb
ee/spec/views/operations/environments.html.haml_spec.rb
+2
-2
ee/spec/views/operations/index.html.haml_spec.rb
ee/spec/views/operations/index.html.haml_spec.rb
+2
-2
No files found.
ee/app/controllers/operations_controller.rb
View file @
6d7078e7
# frozen_string_literal: true
# frozen_string_literal: true
# Note: Both Operations dashboard (https://docs.gitlab.com/ee/user/operations_dashboard/) and Environments dashboard (https://docs.gitlab.com/ee/ci/environments/environments_dashboard.html) features are co-existing in the same controller.
class
OperationsController
<
ApplicationController
class
OperationsController
<
ApplicationController
before_action
:authorize_read_operations_dashboard!
before_action
:authorize_read_operations_dashboard!
respond_to
:json
,
only:
[
:list
]
feature_category
:release_orchestration
feature_category
:release_orchestration
POLLING_INTERVAL
=
120_000
POLLING_INTERVAL
=
120_000
# Used by Operations dashboard.
def
index
def
index
end
respond_to
do
|
format
|
format
.
html
def
environments
end
def
list
format
.
json
do
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
POLLING_INTERVAL
)
set_polling_interval_header
projects
=
load_projects
projects
=
load_projects
render
json:
{
projects:
serialize_as_json
(
projects
)
}
render
json:
{
projects:
serialize_as_json
(
projects
)
}
end
end
end
end
def
environments_list
# Used by Environments dashboard.
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
POLLING_INTERVAL
)
def
environments
respond_to
do
|
format
|
format
.
html
format
.
json
do
set_polling_interval_header
projects
=
load_environments_projects
projects
=
load_environments_projects
render
json:
{
projects:
serialize_as_json_for_environments
(
projects
)
}
render
json:
{
projects:
serialize_as_json_for_environments
(
projects
)
}
end
end
end
end
# Used by Operations and Environments dashboard.
def
create
def
create
respond_to
do
|
format
|
format
.
json
do
project_ids
=
params
[
'project_ids'
]
project_ids
=
params
[
'project_ids'
]
result
=
add_projects
(
project_ids
)
result
=
add_projects
(
project_ids
)
...
@@ -40,7 +50,10 @@ class OperationsController < ApplicationController
...
@@ -40,7 +50,10 @@ class OperationsController < ApplicationController
invalid:
result
.
invalid_project_ids
invalid:
result
.
invalid_project_ids
}
}
end
end
end
end
# Used by Operations and Environments dashboard.
def
destroy
def
destroy
project_id
=
params
[
'project_id'
]
project_id
=
params
[
'project_id'
]
...
@@ -57,6 +70,10 @@ class OperationsController < ApplicationController
...
@@ -57,6 +70,10 @@ class OperationsController < ApplicationController
render_404
unless
can?
(
current_user
,
:read_operations_dashboard
)
render_404
unless
can?
(
current_user
,
:read_operations_dashboard
)
end
end
def
set_polling_interval_header
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
POLLING_INTERVAL
)
end
def
load_projects
def
load_projects
Dashboard
::
Operations
::
ListService
.
new
(
current_user
).
execute
Dashboard
::
Operations
::
ListService
.
new
(
current_user
).
execute
end
end
...
...
ee/app/helpers/ee/operations_helper.rb
View file @
6d7078e7
...
@@ -6,8 +6,8 @@ module EE
...
@@ -6,8 +6,8 @@ module EE
def
operations_data
def
operations_data
{
{
'add-path'
=>
add_operations_project_path
,
'add-path'
=>
add_operations_project_path
(
format: :json
)
,
'list-path'
=>
operations_
list_path
,
'list-path'
=>
operations_
path
(
format: :json
)
,
'empty-dashboard-svg-path'
=>
image_path
(
'illustrations/operations-dashboard_empty.svg'
),
'empty-dashboard-svg-path'
=>
image_path
(
'illustrations/operations-dashboard_empty.svg'
),
'empty-dashboard-help-path'
=>
help_page_path
(
'user/operations_dashboard/index.md'
)
'empty-dashboard-help-path'
=>
help_page_path
(
'user/operations_dashboard/index.md'
)
}
}
...
@@ -15,8 +15,8 @@ module EE
...
@@ -15,8 +15,8 @@ module EE
def
environments_data
def
environments_data
{
{
'add-path'
=>
add_operations_
project_path
,
'add-path'
=>
add_operations_
environments_project_path
(
format: :json
)
,
'list-path'
=>
operations_environments_
list_path
,
'list-path'
=>
operations_environments_
path
(
format: :json
)
,
'empty-dashboard-svg-path'
=>
image_path
(
'illustrations/operations-dashboard_empty.svg'
),
'empty-dashboard-svg-path'
=>
image_path
(
'illustrations/operations-dashboard_empty.svg'
),
'empty-dashboard-help-path'
=>
help_page_path
(
'ci/environments/environments_dashboard.md'
),
'empty-dashboard-help-path'
=>
help_page_path
(
'ci/environments/environments_dashboard.md'
),
'environments-dashboard-help-path'
=>
help_page_path
(
'ci/environments/environments_dashboard.md'
)
'environments-dashboard-help-path'
=>
help_page_path
(
'ci/environments/environments_dashboard.md'
)
...
...
ee/app/serializers/dashboard_environments_project_entity.rb
View file @
6d7078e7
...
@@ -9,7 +9,7 @@ class DashboardEnvironmentsProjectEntity < Grape::Entity
...
@@ -9,7 +9,7 @@ class DashboardEnvironmentsProjectEntity < Grape::Entity
expose
:web_url
expose
:web_url
expose
:remove_path
do
|
project
|
expose
:remove_path
do
|
project
|
remove_operations_project_path
(
project_id:
project
.
id
)
remove_operations_
environments_
project_path
(
project_id:
project
.
id
)
end
end
expose
:namespace
,
using:
API
::
Entities
::
NamespaceBasic
expose
:namespace
,
using:
API
::
Entities
::
NamespaceBasic
...
...
ee/config/routes/operations.rb
View file @
6d7078e7
# frozen_string_literal: true
# frozen_string_literal: true
# Used by Operations dashboard
get
'operations'
=>
'operations#index'
get
'operations'
=>
'operations#index'
get
'operations/environments'
=>
'operations#environments'
get
'operations/list'
=>
'operations#list'
get
'operations/environments_list'
=>
'operations#environments_list'
post
'operations'
=>
'operations#create'
,
as: :add_operations_project
post
'operations'
=>
'operations#create'
,
as: :add_operations_project
delete
'operations'
=>
'operations#destroy'
,
as: :remove_operations_project
delete
'operations'
=>
'operations#destroy'
,
as: :remove_operations_project
# Used by Environments dashboard
get
'operations/environments'
=>
'operations#environments'
post
'operations/environments'
=>
'operations#create'
,
as: :add_operations_environments_project
delete
'operations/environments'
=>
'operations#destroy'
,
as: :remove_operations_environments_project
ee/spec/controllers/operations_controller_spec.rb
View file @
6d7078e7
...
@@ -14,49 +14,31 @@ RSpec.describe OperationsController do
...
@@ -14,49 +14,31 @@ RSpec.describe OperationsController do
sign_in
(
user
)
sign_in
(
user
)
end
end
shared_examples
'unlicensed'
do
|
http_method
,
action
|
shared_examples
'unlicensed'
do
|
http_method
,
action
,
format
=
:html
|
before
do
before
do
stub_licensed_features
(
operations_dashboard:
false
)
stub_licensed_features
(
operations_dashboard:
false
)
end
end
it
'renders 404'
do
it
'renders 404'
do
public_send
(
http_method
,
action
)
public_send
(
http_method
,
action
,
format:
format
)
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
end
end
describe
'GET #index'
do
describe
'GET #index'
do
it_behaves_like
'unlicensed'
,
:get
,
:index
def
get_index
(
format
)
get
:index
,
format:
format
it
'renders index with 200 status code'
do
get
:index
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:index
)
end
end
context
'with an anonymous user'
do
describe
'format html'
do
before
do
it_behaves_like
'unlicensed'
,
:get
,
:index
,
:html
sign_out
(
user
)
end
it
'redirects to sign-in page'
do
get
:index
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
it
'renders index with 200 status code'
do
end
get_index
(
:html
)
end
end
describe
'GET #environments'
do
it_behaves_like
'unlicensed'
,
:get
,
:environments
it
'renders the view'
do
get
:environments
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:environments
)
expect
(
response
).
to
render_template
(
:index
)
end
end
context
'with an anonymous user'
do
context
'with an anonymous user'
do
...
@@ -65,25 +47,25 @@ RSpec.describe OperationsController do
...
@@ -65,25 +47,25 @@ RSpec.describe OperationsController do
end
end
it
'redirects to sign-in page'
do
it
'redirects to sign-in page'
do
get
:environments
get_index
(
:html
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
end
end
end
end
end
end
describe
'GET #list
'
do
describe
'format json
'
do
let
(
:now
)
{
Time
.
current
.
change
(
usec:
0
)
}
let
(
:now
)
{
Time
.
current
.
change
(
usec:
0
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:commit
)
{
project
.
commit
}
let
(
:commit
)
{
project
.
commit
}
let!
(
:environment
)
{
create
(
:environment
,
name:
'production'
,
project:
project
)
}
let!
(
:environment
)
{
create
(
:environment
,
name:
'production'
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
:success
,
environment:
environment
,
sha:
commit
.
id
,
created_at:
now
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
:success
,
environment:
environment
,
sha:
commit
.
id
,
created_at:
now
,
project:
project
)
}
it_behaves_like
'unlicensed'
,
:get
,
:list
it_behaves_like
'unlicensed'
,
:get
,
:index
,
:json
shared_examples
'empty project list'
do
shared_examples
'empty project list'
do
it
'returns an empty list'
do
it
'returns an empty list'
do
get
:list
get_index
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
...
@@ -124,7 +106,7 @@ RSpec.describe OperationsController do
...
@@ -124,7 +106,7 @@ RSpec.describe OperationsController do
end
end
it
'returns a list of added projects'
do
it
'returns a list of added projects'
do
get
:list
get_index
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
...
@@ -148,7 +130,7 @@ RSpec.describe OperationsController do
...
@@ -148,7 +130,7 @@ RSpec.describe OperationsController do
end
end
user
.
update!
(
ops_dashboard_projects:
projects
)
user
.
update!
(
ops_dashboard_projects:
projects
)
get
:list
get_index
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
...
@@ -157,7 +139,7 @@ RSpec.describe OperationsController do
...
@@ -157,7 +139,7 @@ RSpec.describe OperationsController do
end
end
it
'returns a list of added projects'
do
it
'returns a list of added projects'
do
get
:list
get_index
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/list'
,
dir:
'ee'
)
...
@@ -183,16 +165,30 @@ RSpec.describe OperationsController do
...
@@ -183,16 +165,30 @@ RSpec.describe OperationsController do
sign_out
(
user
)
sign_out
(
user
)
end
end
it
'redirects to sign-in pag
e'
do
it
'returns unauthorized respons
e'
do
get
:list
get_index
(
:json
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
expect
(
response
).
to
have_gitlab_http_status
(
:unauthorized
)
expect
(
json_response
[
'error'
]).
to
include
(
'sign in or sign up before continuing'
)
end
end
end
end
end
end
end
describe
'GET #environments_list'
do
describe
'GET #environments'
do
it_behaves_like
'unlicensed'
,
:get
,
:environments_list
def
get_environments
(
format
,
params
=
nil
)
get
:environments
,
params:
params
,
format:
format
end
describe
'format html'
do
it_behaves_like
'unlicensed'
,
:get
,
:environments
,
:html
it
'renders the view'
do
get_environments
(
:html
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:environments
)
end
context
'with an anonymous user'
do
context
'with an anonymous user'
do
before
do
before
do
...
@@ -200,11 +196,28 @@ RSpec.describe OperationsController do
...
@@ -200,11 +196,28 @@ RSpec.describe OperationsController do
end
end
it
'redirects to sign-in page'
do
it
'redirects to sign-in page'
do
get
:environments_list
get_environments
(
:html
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
end
end
end
end
end
describe
'format json'
do
it_behaves_like
'unlicensed'
,
:get
,
:environments
,
:json
context
'with an anonymous user'
do
before
do
sign_out
(
user
)
end
it
'returns unauthorized response'
do
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:unauthorized
)
expect
(
json_response
[
'error'
]).
to
include
(
'sign in or sign up before continuing'
)
end
end
context
'with an authenticated user without sufficient access_level'
do
context
'with an authenticated user without sufficient access_level'
do
it
'returns an empty project list'
do
it
'returns an empty project list'
do
...
@@ -212,7 +225,7 @@ RSpec.describe OperationsController do
...
@@ -212,7 +225,7 @@ RSpec.describe OperationsController do
project
.
add_reporter
(
user
)
project
.
add_reporter
(
user
)
user
.
update!
(
ops_dashboard_projects:
[
project
])
user
.
update!
(
ops_dashboard_projects:
[
project
])
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'projects'
]).
to
eq
([])
expect
(
json_response
[
'projects'
]).
to
eq
([])
...
@@ -221,14 +234,14 @@ RSpec.describe OperationsController do
...
@@ -221,14 +234,14 @@ RSpec.describe OperationsController do
context
'with an authenticated developer'
do
context
'with an authenticated developer'
do
it
'returns an empty project list'
do
it
'returns an empty project list'
do
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'projects'
]).
to
eq
([])
expect
(
json_response
[
'projects'
]).
to
eq
([])
end
end
it
'sets the polling interval header'
do
it
'sets the polling interval header'
do
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
.
headers
[
Gitlab
::
PollingInterval
::
HEADER_NAME
]).
to
eq
(
'120000'
)
expect
(
response
.
headers
[
Gitlab
::
PollingInterval
::
HEADER_NAME
]).
to
eq
(
'120000'
)
...
@@ -239,7 +252,7 @@ RSpec.describe OperationsController do
...
@@ -239,7 +252,7 @@ RSpec.describe OperationsController do
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
user
.
update!
(
ops_dashboard_projects:
[])
user
.
update!
(
ops_dashboard_projects:
[])
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'projects'
]).
to
eq
([])
expect
(
json_response
[
'projects'
]).
to
eq
([])
...
@@ -254,10 +267,10 @@ RSpec.describe OperationsController do
...
@@ -254,10 +267,10 @@ RSpec.describe OperationsController do
end
end
it
'returns a project without an environment'
do
it
'returns a project without an environment'
do
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
...
@@ -271,10 +284,10 @@ RSpec.describe OperationsController do
...
@@ -271,10 +284,10 @@ RSpec.describe OperationsController do
it
'returns one project with one environment'
do
it
'returns one project with one environment'
do
environment
=
create
(
:environment
,
project:
project
,
name:
'staging'
)
environment
=
create
(
:environment
,
project:
project
,
name:
'staging'
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
...
@@ -295,10 +308,10 @@ RSpec.describe OperationsController do
...
@@ -295,10 +308,10 @@ RSpec.describe OperationsController do
environment2
=
create
(
:environment
,
project:
project
)
environment2
=
create
(
:environment
,
project:
project
)
environment3
=
create
(
:environment
,
project:
project2
)
environment3
=
create
(
:environment
,
project:
project2
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
2
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
2
)
expect
(
json_response
[
'projects'
].
map
{
|
p
|
p
[
'id'
]
}.
sort
).
to
eq
([
project
.
id
,
project2
.
id
])
expect
(
json_response
[
'projects'
].
map
{
|
p
|
p
[
'id'
]
}.
sort
).
to
eq
([
project
.
id
,
project2
.
id
])
...
@@ -313,10 +326,10 @@ RSpec.describe OperationsController do
...
@@ -313,10 +326,10 @@ RSpec.describe OperationsController do
create
(
:environment
,
project:
project
,
name:
'review/test-feature'
)
create
(
:environment
,
project:
project
,
name:
'review/test-feature'
)
create
(
:environment
,
project:
project
,
name:
'review/another-feature'
)
create
(
:environment
,
project:
project
,
name:
'review/another-feature'
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
...
@@ -326,10 +339,10 @@ RSpec.describe OperationsController do
...
@@ -326,10 +339,10 @@ RSpec.describe OperationsController do
it
'does not return environments that would be grouped into a folder even when there is only a single environment'
do
it
'does not return environments that would be grouped into a folder even when there is only a single environment'
do
create
(
:environment
,
project:
project
,
name:
'staging/test-feature'
)
create
(
:environment
,
project:
project
,
name:
'staging/test-feature'
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
...
@@ -339,10 +352,10 @@ RSpec.describe OperationsController do
...
@@ -339,10 +352,10 @@ RSpec.describe OperationsController do
it
'returns an environment not in a folder'
do
it
'returns an environment not in a folder'
do
environment
=
create
(
:environment
,
project:
project
,
name:
'production'
)
environment
=
create
(
:environment
,
project:
project
,
name:
'production'
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
...
@@ -354,10 +367,10 @@ RSpec.describe OperationsController do
...
@@ -354,10 +367,10 @@ RSpec.describe OperationsController do
environment
=
create
(
:environment
,
project:
project
)
environment
=
create
(
:environment
,
project:
project
)
deployment
=
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
)
deployment
=
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -371,10 +384,10 @@ RSpec.describe OperationsController do
...
@@ -371,10 +384,10 @@ RSpec.describe OperationsController do
ci_build
=
create
(
:ci_build
,
project:
project
)
ci_build
=
create
(
:ci_build
,
project:
project
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -388,10 +401,10 @@ RSpec.describe OperationsController do
...
@@ -388,10 +401,10 @@ RSpec.describe OperationsController do
environment
=
create
(
:environment
,
project:
project
)
environment
=
create
(
:environment
,
project:
project
)
deployment
=
create
(
:deployment
,
:failed
,
project:
project
,
environment:
environment
)
deployment
=
create
(
:deployment
,
:failed
,
project:
project
,
environment:
environment
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -403,10 +416,10 @@ RSpec.describe OperationsController do
...
@@ -403,10 +416,10 @@ RSpec.describe OperationsController do
context
'with environments pagination'
do
context
'with environments pagination'
do
shared_examples_for
'environments pagination'
do
|
params
,
projects_count
|
shared_examples_for
'environments pagination'
do
|
params
,
projects_count
|
specify
do
specify
do
get
:environments_list
,
params:
params
get_environments
(
:json
,
params
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
projects_count
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
projects_count
)
expect
(
response
).
to
include_pagination_headers
expect
(
response
).
to
include_pagination_headers
end
end
...
@@ -434,7 +447,7 @@ RSpec.describe OperationsController do
...
@@ -434,7 +447,7 @@ RSpec.describe OperationsController do
end
end
context
'N+1 queries'
do
context
'N+1 queries'
do
subject
{
get
:environments_list
}
subject
{
get_environments
(
:json
)
}
it
'avoids N+1 database queries'
do
it
'avoids N+1 database queries'
do
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
}.
count
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
}.
count
...
@@ -456,10 +469,10 @@ RSpec.describe OperationsController do
...
@@ -456,10 +469,10 @@ RSpec.describe OperationsController do
unavailable_project
.
add_developer
(
user
)
unavailable_project
.
add_developer
(
user
)
user
.
update!
(
ops_dashboard_projects:
[
unavailable_project
])
user
.
update!
(
ops_dashboard_projects:
[
unavailable_project
])
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
0
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
0
)
end
end
...
@@ -480,10 +493,10 @@ RSpec.describe OperationsController do
...
@@ -480,10 +493,10 @@ RSpec.describe OperationsController do
all_projects
=
[
private_project
]
+
public_projects
all_projects
=
[
private_project
]
+
public_projects
user
.
update!
(
ops_dashboard_projects:
all_projects
)
user
.
update!
(
ops_dashboard_projects:
all_projects
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
7
)
expect
(
json_response
[
'projects'
].
count
).
to
eq
(
7
)
actual_ids
=
json_response
[
'projects'
].
map
{
|
p
|
p
[
'id'
].
to_i
}
actual_ids
=
json_response
[
'projects'
].
map
{
|
p
|
p
[
'id'
].
to_i
}
...
@@ -498,10 +511,10 @@ RSpec.describe OperationsController do
...
@@ -498,10 +511,10 @@ RSpec.describe OperationsController do
create
(
:environment
,
project:
project
)
create
(
:environment
,
project:
project
)
create
(
:environment
,
project:
project
)
create
(
:environment
,
project:
project
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
...
@@ -521,10 +534,10 @@ RSpec.describe OperationsController do
...
@@ -521,10 +534,10 @@ RSpec.describe OperationsController do
create
(
:environment
,
project:
project_b
)
create
(
:environment
,
project:
project_b
)
user
.
update!
(
ops_dashboard_projects:
[
project
,
project_b
])
user
.
update!
(
ops_dashboard_projects:
[
project
,
project_b
])
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
find
{
|
p
|
p
[
'id'
]
==
project
.
id
}
project_json
=
json_response
[
'projects'
].
find
{
|
p
|
p
[
'id'
]
==
project
.
id
}
project_b_json
=
json_response
[
'projects'
].
find
{
|
p
|
p
[
'id'
]
==
project_b
.
id
}
project_b_json
=
json_response
[
'projects'
].
find
{
|
p
|
p
[
'id'
]
==
project_b
.
id
}
...
@@ -548,10 +561,10 @@ RSpec.describe OperationsController do
...
@@ -548,10 +561,10 @@ RSpec.describe OperationsController do
ci_build
=
create
(
:ci_build
,
project:
project
,
pipeline:
pipeline
)
ci_build
=
create
(
:ci_build
,
project:
project
,
pipeline:
pipeline
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -567,10 +580,10 @@ RSpec.describe OperationsController do
...
@@ -567,10 +580,10 @@ RSpec.describe OperationsController do
ci_build
=
create
(
:ci_build
,
project:
project
,
pipeline:
pipeline
)
ci_build
=
create
(
:ci_build
,
project:
project
,
pipeline:
pipeline
)
create
(
:deployment
,
:canceled
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
create
(
:deployment
,
:canceled
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -593,10 +606,10 @@ RSpec.describe OperationsController do
...
@@ -593,10 +606,10 @@ RSpec.describe OperationsController do
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
create
(
:ci_sources_pipeline
,
project:
project
,
pipeline:
pipeline
,
source_project:
project_b
,
source_pipeline:
pipeline_b
,
source_job:
ci_build_b
)
create
(
:ci_sources_pipeline
,
project:
project
,
pipeline:
pipeline
,
source_project:
project_b
,
source_pipeline:
pipeline_b
,
source_job:
ci_build_b
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -622,10 +635,10 @@ RSpec.describe OperationsController do
...
@@ -622,10 +635,10 @@ RSpec.describe OperationsController do
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
environment
,
deployable:
ci_build
,
sha:
commit
.
sha
)
create
(
:ci_sources_pipeline
,
project:
project_b
,
pipeline:
pipeline_b
,
source_project:
project
,
source_pipeline:
pipeline
,
source_job:
ci_build
)
create
(
:ci_sources_pipeline
,
project:
project_b
,
pipeline:
pipeline_b
,
source_project:
project
,
source_pipeline:
pipeline
,
source_job:
ci_build
)
get
:environments_list
get_environments
(
:json
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments_list
'
,
dir:
'ee'
)
expect
(
response
).
to
match_response_schema
(
'dashboard/operations/environments
'
,
dir:
'ee'
)
project_json
=
json_response
[
'projects'
].
first
project_json
=
json_response
[
'projects'
].
first
environment_json
=
project_json
[
'environments'
].
first
environment_json
=
project_json
[
'environments'
].
first
...
@@ -647,9 +660,15 @@ RSpec.describe OperationsController do
...
@@ -647,9 +660,15 @@ RSpec.describe OperationsController do
end
end
end
end
end
end
end
describe
'POST #create'
do
describe
'POST #create'
do
it_behaves_like
'unlicensed'
,
:post
,
:create
describe
'format json'
do
it_behaves_like
'unlicensed'
,
:post
,
:create
,
:json
def
post_create
(
params
)
post
:create
,
params:
params
,
format: :json
end
context
'without added projects'
do
context
'without added projects'
do
let
(
:project_a
)
{
create
(
:project
)
}
let
(
:project_a
)
{
create
(
:project
)
}
...
@@ -661,7 +680,7 @@ RSpec.describe OperationsController do
...
@@ -661,7 +680,7 @@ RSpec.describe OperationsController do
end
end
it
'adds projects to the dashboard'
do
it
'adds projects to the dashboard'
do
post
:create
,
params:
{
project_ids:
[
project_a
.
id
,
project_b
.
id
.
to_s
]
}
post_create
({
project_ids:
[
project_a
.
id
,
project_b
.
id
.
to_s
]
})
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
...
@@ -674,7 +693,7 @@ RSpec.describe OperationsController do
...
@@ -674,7 +693,7 @@ RSpec.describe OperationsController do
end
end
it
'cannot add a project twice'
do
it
'cannot add a project twice'
do
post
:create
,
params:
{
project_ids:
[
project_a
.
id
,
project_a
.
id
]
}
post_create
({
project_ids:
[
project_a
.
id
,
project_a
.
id
]
})
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
...
@@ -687,7 +706,7 @@ RSpec.describe OperationsController do
...
@@ -687,7 +706,7 @@ RSpec.describe OperationsController do
end
end
it
'does not add invalid project ids'
do
it
'does not add invalid project ids'
do
post
:create
,
params:
{
project_ids:
[
''
,
-
1
,
'-2'
]
}
post_create
({
project_ids:
[
''
,
-
1
,
'-2'
]
})
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
...
@@ -709,7 +728,7 @@ RSpec.describe OperationsController do
...
@@ -709,7 +728,7 @@ RSpec.describe OperationsController do
end
end
it
'does not add already added project'
do
it
'does not add already added project'
do
post
:create
,
params:
{
project_ids:
[
project
.
id
]
}
post_create
({
project_ids:
[
project
.
id
]
})
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
expect
(
json_response
).
to
match_schema
(
'dashboard/operations/add'
,
dir:
'ee'
)
...
@@ -734,6 +753,7 @@ RSpec.describe OperationsController do
...
@@ -734,6 +753,7 @@ RSpec.describe OperationsController do
end
end
end
end
end
end
end
describe
'DELETE #destroy'
do
describe
'DELETE #destroy'
do
it_behaves_like
'unlicensed'
,
:delete
,
:destroy
it_behaves_like
'unlicensed'
,
:delete
,
:destroy
...
...
ee/spec/fixtures/api/schemas/dashboard/operations/environments
_list
.json
→
ee/spec/fixtures/api/schemas/dashboard/operations/environments.json
View file @
6d7078e7
File moved
ee/spec/routing/operations_routing_spec.rb
0 → 100644
View file @
6d7078e7
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'Operations routing'
,
'routing'
do
describe
'/-/operations'
do
it
'routes to the operations index action'
do
expect
(
get
(
"
#{
operations_path
}
.html"
)).
to
route_to
(
controller:
'operations'
,
action:
'index'
,
format:
'html'
)
expect
(
get
(
"
#{
operations_path
}
.json"
)).
to
route_to
(
controller:
'operations'
,
action:
'index'
,
format:
'json'
)
end
it
'routes to the operations create action'
do
expect
(
post
(
"
#{
add_operations_project_path
}
.json"
)).
to
route_to
(
controller:
'operations'
,
action:
'create'
,
format:
'json'
)
end
it
'routes to operations destroy action'
do
expect
(
delete
(
"
#{
remove_operations_project_path
}
.json"
)).
to
route_to
(
controller:
'operations'
,
action:
'destroy'
,
format:
'json'
)
end
end
describe
'/-/operations/environments'
do
it
'routes to the environments list action'
do
expect
(
get
(
"
#{
operations_environments_path
}
.html"
)).
to
route_to
(
controller:
'operations'
,
action:
'environments'
,
format:
'html'
)
expect
(
get
(
"
#{
operations_environments_path
}
.json"
)).
to
route_to
(
controller:
'operations'
,
action:
'environments'
,
format:
'json'
)
end
it
'routes to the environments create action'
do
expect
(
post
(
"
#{
add_operations_environments_project_path
}
.json"
)).
to
route_to
(
controller:
'operations'
,
action:
'create'
,
format:
'json'
)
end
it
'routes to environments destroy action'
do
expect
(
delete
(
"
#{
remove_operations_environments_project_path
}
.json"
)).
to
route_to
(
controller:
'operations'
,
action:
'destroy'
,
format:
'json'
)
end
end
end
ee/spec/views/operations/environments.html.haml_spec.rb
View file @
6d7078e7
...
@@ -6,8 +6,8 @@ RSpec.describe 'operations/environments.html.haml' do
...
@@ -6,8 +6,8 @@ RSpec.describe 'operations/environments.html.haml' do
it
'renders the frontend configuration'
do
it
'renders the frontend configuration'
do
render
render
expect
(
rendered
).
to
match
%r{data-add-path="/-/operations"}
expect
(
rendered
).
to
match
%r{data-add-path="/-/operations
/environments.json
"}
expect
(
rendered
).
to
match
%r{data-list-path="/-/operations/environments
_list
"}
expect
(
rendered
).
to
match
%r{data-list-path="/-/operations/environments
.json
"}
expect
(
rendered
).
to
match
%r{data-empty-dashboard-svg-path="/assets/illustrations/operations-dashboard_empty.*
\.
svg"}
expect
(
rendered
).
to
match
%r{data-empty-dashboard-svg-path="/assets/illustrations/operations-dashboard_empty.*
\.
svg"}
expect
(
rendered
).
to
match
%r{data-empty-dashboard-help-path="/help/ci/environments/environments_dashboard.md"}
expect
(
rendered
).
to
match
%r{data-empty-dashboard-help-path="/help/ci/environments/environments_dashboard.md"}
expect
(
rendered
).
to
match
%r{data-environments-dashboard-help-path="/help/ci/environments/environments_dashboard.md"}
expect
(
rendered
).
to
match
%r{data-environments-dashboard-help-path="/help/ci/environments/environments_dashboard.md"}
...
...
ee/spec/views/operations/index.html.haml_spec.rb
View file @
6d7078e7
...
@@ -6,8 +6,8 @@ RSpec.describe 'operations/index.html.haml' do
...
@@ -6,8 +6,8 @@ RSpec.describe 'operations/index.html.haml' do
it
'renders the frontend configuration'
do
it
'renders the frontend configuration'
do
render
render
expect
(
rendered
).
to
match
%r{data-add-path="/-/operations"}
expect
(
rendered
).
to
match
%r{data-add-path="/-/operations
.json
"}
expect
(
rendered
).
to
match
%r{data-list-path="/-/operations
/list
"}
expect
(
rendered
).
to
match
%r{data-list-path="/-/operations
.json
"}
expect
(
rendered
).
to
match
%{data-empty-dashboard-svg-path="/assets/illustrations/operations-dashboard_empty.*\.svg"}
expect
(
rendered
).
to
match
%{data-empty-dashboard-svg-path="/assets/illustrations/operations-dashboard_empty.*\.svg"}
expect
(
rendered
).
to
match
%r{data-empty-dashboard-help-path="/help/user/operations_dashboard/index.md"}
expect
(
rendered
).
to
match
%r{data-empty-dashboard-help-path="/help/user/operations_dashboard/index.md"}
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