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
b30593ff
Commit
b30593ff
authored
Mar 05, 2020
by
Sean Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix operation helper spec
parent
538a8ecc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/helpers/operations_helper.rb
ee/app/helpers/operations_helper.rb
+1
-1
ee/spec/helpers/ee/operations_helper_spec.rb
ee/spec/helpers/ee/operations_helper_spec.rb
+1
-1
No files found.
ee/app/helpers/operations_helper.rb
View file @
b30593ff
...
...
@@ -23,7 +23,7 @@ module OperationsHelper
def
status_page_settings_data
(
status_page_setting
)
{
'user-can-enable-status-page'
=>
can?
(
current_user
,
:admin_operations
,
@project
).
to_s
,
'setting-enabled'
=>
status_page_setting
&
.
enabled?
.
to_s
,
'setting-enabled'
=>
status_page_setting
&
.
enabled?
&
.
to_s
,
'setting-aws-access-key'
=>
status_page_setting
&
.
aws_access_key
,
'setting-masked-aws-secret-key'
=>
status_page_setting
&
.
masked_aws_secret_key
,
'setting-aws-region'
=>
status_page_setting
&
.
aws_region
,
...
...
ee/spec/helpers/ee/operations_helper_spec.rb
View file @
b30593ff
...
...
@@ -53,7 +53,7 @@ describe OperationsHelper do
it
'returns the correct values'
do
aggregate_failures
do
expect
(
subject
[
'user-can-enable-status-page'
]).
to
eq
(
'true'
)
expect
(
subject
[
'setting-enabled'
]).
to
eq
(
status_page_setting
.
enabled
)
expect
(
subject
[
'setting-enabled'
]).
to
eq
(
status_page_setting
.
enabled
.
to_s
)
expect
(
subject
[
'setting-aws-access-key'
]).
to
eq
(
status_page_setting
.
aws_access_key
)
expect
(
subject
[
'setting-masked-aws-secret-key'
]).
to
eq
(
status_page_setting
.
masked_aws_secret_key
)
expect
(
subject
[
'setting-aws-region'
]).
to
eq
(
status_page_setting
.
aws_region
)
...
...
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