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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
c99f8e88
Commit
c99f8e88
authored
Jul 03, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement uniqueness_of_in_memory_validator
parent
cd6aa922
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
37 deletions
+72
-37
app/models/ci/pipeline_schedule.rb
app/models/ci/pipeline_schedule.rb
+5
-0
app/validators/uniqueness_of_in_memory_validator.rb
app/validators/uniqueness_of_in_memory_validator.rb
+37
-0
spec/controllers/projects/pipeline_schedules_controller_spec.rb
...ontrollers/projects/pipeline_schedules_controller_spec.rb
+30
-37
No files found.
app/models/ci/pipeline_schedule.rb
View file @
c99f8e88
...
@@ -15,6 +15,11 @@ module Ci
...
@@ -15,6 +15,11 @@ module Ci
validates
:cron_timezone
,
cron_timezone:
true
,
presence:
{
unless: :importing?
}
validates
:cron_timezone
,
cron_timezone:
true
,
presence:
{
unless: :importing?
}
validates
:ref
,
presence:
{
unless: :importing?
}
validates
:ref
,
presence:
{
unless: :importing?
}
validates
:description
,
presence:
true
validates
:description
,
presence:
true
validates
:variables
,
uniqueness_of_in_memory:
{
:collection
=>
:variables
,
:attrs
=>
[
:pipeline_schedule_id
,
:key
],
:message
=>
[
'variables.key'
,
'keys are duplicated'
]
}
before_save
:set_next_run_at
before_save
:set_next_run_at
...
...
app/validators/uniqueness_of_in_memory_validator.rb
0 → 100644
View file @
c99f8e88
# UniquenessOfInMemoryValidator
#
# This validtor is designed for especially the following condition
# - Use `accepts_nested_attributes_for :xxx` in a parent model
# - Use `validates :xxx, uniqueness: { scope: :xxx_id }` in a child model
#
# Inspired by https://stackoverflow.com/a/2883129/2522666
module
ActiveRecord
class
Base
# Validate that the the objects in +collection+ are unique
# when compared against all their non-blank +attrs+. If not
# add +message+ to the base errors.
def
validate_uniqueness_of_in_memory
(
collection
,
attrs
,
message
)
hashes
=
collection
.
inject
({})
do
|
hash
,
record
|
key
=
attrs
.
map
{
|
a
|
record
.
send
(
a
).
to_s
}.
join
if
key
.
blank?
||
record
.
marked_for_destruction?
key
=
record
.
object_id
end
hash
[
key
]
=
record
unless
hash
[
key
]
hash
end
if
collection
.
length
>
hashes
.
length
self
.
errors
.
add
(
*
message
)
end
end
end
end
class
UniquenessOfInMemoryValidator
<
ActiveModel
::
Validator
def
validate
(
record
)
record
.
validate_uniqueness_of_in_memory
(
record
.
public_send
(
options
[
:collection
]),
options
[
:attrs
],
options
[
:message
])
end
end
spec/controllers/projects/pipeline_schedules_controller_spec.rb
View file @
c99f8e88
...
@@ -150,22 +150,21 @@ describe Projects::PipelineSchedulesController do
...
@@ -150,22 +150,21 @@ describe Projects::PipelineSchedulesController do
end
end
end
end
# This test no longer passes, since we removed a custom validation
context
'when variables_attributes has two variables and duplicted'
do
# context 'when variables_attributes has two variables and duplicted' do
let
(
:schedule
)
do
# let(:schedule) do
basic_param
.
merge
({
# basic_param.merge({
variables_attributes:
[{
key:
'AAA'
,
value:
'AAA123'
},
{
key:
'AAA'
,
value:
'BBB123'
}]
# variables_attributes: [{ key: 'AAA', value: 'AAA123' }, { key: 'AAA', value: 'BBB123' }]
})
# })
end
# end
it
'returns an error that the keys of variable are duplicated'
do
# it 'returns an error that the keys of variable are duplicated' do
expect
{
go
}
# expect { go }
.
to
change
{
Ci
::
PipelineSchedule
.
count
}.
by
(
0
)
# .to change { Ci::PipelineSchedule.count }.by(0)
.
and
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
0
)
# .and change { Ci::PipelineScheduleVariable.count }.by(0)
expect
(
assigns
(
:schedule
).
errors
[
'variables.key'
]).
not_to
be_empty
# expect(assigns(:schedule).errors['variables.key']).not_to be_empty
end
# end
end
# end
end
end
describe
'security'
do
describe
'security'
do
...
@@ -194,7 +193,6 @@ describe Projects::PipelineSchedulesController do
...
@@ -194,7 +193,6 @@ describe Projects::PipelineSchedulesController do
before
do
before
do
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
@@ -210,7 +208,6 @@ describe Projects::PipelineSchedulesController do
...
@@ -210,7 +208,6 @@ describe Projects::PipelineSchedulesController do
go
go
pipeline_schedule
.
reload
pipeline_schedule
.
reload
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
pipeline_schedule
.
description
).
to
eq
(
'updated_desc'
)
expect
(
pipeline_schedule
.
description
).
to
eq
(
'updated_desc'
)
expect
(
pipeline_schedule
.
cron
).
to
eq
(
'0 1 * * *'
)
expect
(
pipeline_schedule
.
cron
).
to
eq
(
'0 1 * * *'
)
...
@@ -232,7 +229,6 @@ describe Projects::PipelineSchedulesController do
...
@@ -232,7 +229,6 @@ describe Projects::PipelineSchedulesController do
expect
{
go
}.
to
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
1
)
expect
{
go
}.
to
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
1
)
pipeline_schedule
.
reload
pipeline_schedule
.
reload
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
pipeline_schedule
.
variables
.
last
.
key
).
to
eq
(
'AAA'
)
expect
(
pipeline_schedule
.
variables
.
last
.
key
).
to
eq
(
'AAA'
)
expect
(
pipeline_schedule
.
variables
.
last
.
value
).
to
eq
(
'AAA123'
)
expect
(
pipeline_schedule
.
variables
.
last
.
value
).
to
eq
(
'AAA123'
)
...
@@ -250,7 +246,6 @@ describe Projects::PipelineSchedulesController do
...
@@ -250,7 +246,6 @@ describe Projects::PipelineSchedulesController do
expect
{
go
}.
to
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
2
)
expect
{
go
}.
to
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
2
)
pipeline_schedule
.
reload
pipeline_schedule
.
reload
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
pipeline_schedule
.
variables
.
first
.
key
).
to
eq
(
'AAA'
)
expect
(
pipeline_schedule
.
variables
.
first
.
key
).
to
eq
(
'AAA'
)
expect
(
pipeline_schedule
.
variables
.
first
.
value
).
to
eq
(
'AAA123'
)
expect
(
pipeline_schedule
.
variables
.
first
.
value
).
to
eq
(
'AAA123'
)
...
@@ -259,21 +254,20 @@ describe Projects::PipelineSchedulesController do
...
@@ -259,21 +254,20 @@ describe Projects::PipelineSchedulesController do
end
end
end
end
# This test no longer passes, since we removed a custom validation
context
'when params include two duplicated variables'
do
# context 'when params include two duplicated variables' do
let
(
:schedule
)
do
# let(:schedule) do
basic_param
.
merge
({
# basic_param.merge({
variables_attributes:
[{
key:
'AAA'
,
value:
'AAA123'
},
{
key:
'AAA'
,
value:
'BBB123'
}]
# variables_attributes: [{ key: 'AAA', value: 'AAA123' }, { key: 'AAA', value: 'BBB123' }]
})
# })
end
# end
it
'returns an error that variables are duplciated'
do
# it 'returns an error that variables are duplciated' do
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
# put :update, namespace_id: project.namespace.to_param,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
schedule
# project_id: project, id: pipeline_schedule, schedule: schedule
expect
(
assigns
(
:schedule
).
errors
[
'variables.key'
]).
not_to
be_empty
# expect(assigns(:schedule).errors['variables.key']).not_to be_empty
end
# end
end
# end
end
end
context
'when a pipeline schedule has one variable'
do
context
'when a pipeline schedule has one variable'
do
...
@@ -293,7 +287,6 @@ describe Projects::PipelineSchedulesController do
...
@@ -293,7 +287,6 @@ describe Projects::PipelineSchedulesController do
go
go
pipeline_schedule
.
reload
pipeline_schedule
.
reload
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
response
).
to
have_http_status
(
:found
)
expect
(
pipeline_schedule
.
description
).
to
eq
(
'updated_desc'
)
expect
(
pipeline_schedule
.
description
).
to
eq
(
'updated_desc'
)
expect
(
pipeline_schedule
.
cron
).
to
eq
(
'0 1 * * *'
)
expect
(
pipeline_schedule
.
cron
).
to
eq
(
'0 1 * * *'
)
...
@@ -316,6 +309,7 @@ describe Projects::PipelineSchedulesController do
...
@@ -316,6 +309,7 @@ describe Projects::PipelineSchedulesController do
it
'adds the new variable'
do
it
'adds the new variable'
do
expect
{
go
}.
to
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
1
)
expect
{
go
}.
to
change
{
Ci
::
PipelineScheduleVariable
.
count
}.
by
(
1
)
pipeline_schedule
.
reload
expect
(
pipeline_schedule
.
variables
.
last
.
key
).
to
eq
(
'AAA'
)
expect
(
pipeline_schedule
.
variables
.
last
.
key
).
to
eq
(
'AAA'
)
end
end
end
end
...
@@ -331,7 +325,6 @@ describe Projects::PipelineSchedulesController do
...
@@ -331,7 +325,6 @@ describe Projects::PipelineSchedulesController do
expect
{
go
}.
not_to
change
{
Ci
::
PipelineScheduleVariable
.
count
}
expect
{
go
}.
not_to
change
{
Ci
::
PipelineScheduleVariable
.
count
}
pipeline_schedule_variable
.
reload
pipeline_schedule_variable
.
reload
expect
(
pipeline_schedule_variable
.
value
).
to
eq
(
'new_value'
)
expect
(
pipeline_schedule_variable
.
value
).
to
eq
(
'new_value'
)
end
end
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