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
fade45fe
Commit
fade45fe
authored
Jun 25, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rails5 fix expected: ({...}) got: (<ActionController::Parameters {...})
parent
14a11461
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
ee/changelogs/unreleased/rails5-fix-6606.yml
ee/changelogs/unreleased/rails5-fix-6606.yml
+5
-0
ee/spec/controllers/admin/push_rules_controller_spec.rb
ee/spec/controllers/admin/push_rules_controller_spec.rb
+4
-4
No files found.
ee/changelogs/unreleased/rails5-fix-6606.yml
0 → 100644
View file @
fade45fe
---
title
:
'
Rails5
fix
expected:
({...})
got:
(<ActionController::Parameters
{...})'
merge_request
:
6271
author
:
Jasper Maes
type
:
fixed
ee/spec/controllers/admin/push_rules_controller_spec.rb
View file @
fade45fe
...
@@ -10,14 +10,14 @@ describe Admin::PushRulesController do
...
@@ -10,14 +10,14 @@ describe Admin::PushRulesController do
describe
'#update'
do
describe
'#update'
do
let
(
:params
)
do
let
(
:params
)
do
{
{
deny_delete_tag:
true
,
delete_branch_regex:
"any"
,
commit_message_regex:
"any"
,
branch_name_regex:
"any"
,
deny_delete_tag:
"true"
,
delete_branch_regex:
"any"
,
commit_message_regex:
"any"
,
branch_name_regex:
"any"
,
force_push_regex:
"any"
,
author_email_regex:
"any"
,
member_check:
true
,
file_name_regex:
"any"
,
force_push_regex:
"any"
,
author_email_regex:
"any"
,
member_check:
"true"
,
file_name_regex:
"any"
,
max_file_size:
"0"
,
prevent_secrets:
true
max_file_size:
"0"
,
prevent_secrets:
"true"
}
}
end
end
it
'updates sample push rule'
do
it
'updates sample push rule'
do
expect_any_instance_of
(
PushRule
).
to
receive
(
:update_attributes
).
with
(
params
)
expect_any_instance_of
(
PushRule
).
to
receive
(
:update_attributes
).
with
(
ActionController
::
Parameters
.
new
(
params
).
permit!
)
patch
:update
,
push_rule:
params
patch
:update
,
push_rule:
params
...
...
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