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
f229290a
Commit
f229290a
authored
Apr 04, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove triggers_helper. Add trigger_schedule_presenter.
parent
4a5c6a8e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
10 deletions
+39
-10
app/helpers/triggers_helper.rb
app/helpers/triggers_helper.rb
+0
-7
app/models/ci/trigger_schedule.rb
app/models/ci/trigger_schedule.rb
+1
-0
app/presenters/ci/trigger_schedule_presenter.rb
app/presenters/ci/trigger_schedule_presenter.rb
+11
-0
spec/presenters/ci/trigger_schedule_presenter_spec.rb
spec/presenters/ci/trigger_schedule_presenter_spec.rb
+27
-3
No files found.
app/helpers/triggers_helper.rb
View file @
f229290a
...
@@ -10,11 +10,4 @@ module TriggersHelper
...
@@ -10,11 +10,4 @@ module TriggersHelper
def
service_trigger_url
(
service
)
def
service_trigger_url
(
service
)
"
#{
Settings
.
gitlab
.
url
}
/api/v3/projects/
#{
service
.
project_id
}
/services/
#{
service
.
to_param
}
/trigger"
"
#{
Settings
.
gitlab
.
url
}
/api/v3/projects/
#{
service
.
project_id
}
/services/
#{
service
.
to_param
}
/trigger"
end
end
def
real_next_run
(
trigger_schedule
,
worker_cron:
Settings
.
cron_jobs
[
'trigger_schedule_worker'
][
'cron'
],
worker_time_zone:
Time
.
zone
.
name
)
Gitlab
::
Ci
::
CronParser
.
new
(
worker_cron
,
worker_time_zone
)
.
next_time_from
(
trigger_schedule
.
next_run_at
)
end
end
end
app/models/ci/trigger_schedule.rb
View file @
f229290a
...
@@ -2,6 +2,7 @@ module Ci
...
@@ -2,6 +2,7 @@ module Ci
class
TriggerSchedule
<
ActiveRecord
::
Base
class
TriggerSchedule
<
ActiveRecord
::
Base
extend
Ci
::
Model
extend
Ci
::
Model
include
Importable
include
Importable
include
Presentable
acts_as_paranoid
acts_as_paranoid
...
...
app/presenters/ci/trigger_schedule_presenter.rb
0 → 100644
View file @
f229290a
module
Ci
class
TriggerSchedulePresenter
<
Gitlab
::
View
::
Presenter
::
Delegated
presents
:trigger_schedule
def
real_next_run
(
worker_cron:
Settings
.
cron_jobs
[
'trigger_schedule_worker'
][
'cron'
],
worker_time_zone:
Time
.
zone
.
name
)
Gitlab
::
Ci
::
CronParser
.
new
(
worker_cron
,
worker_time_zone
)
.
next_time_from
(
next_run_at
)
end
end
end
spec/
helpers/triggers_help
er_spec.rb
→
spec/
presenters/ci/trigger_schedule_present
er_spec.rb
View file @
f229290a
require
'rails_helper'
require
'spec_helper'
describe
Ci
::
TriggerSchedulePresenter
do
let
(
:trigger_schedule
)
{
create
(
:ci_trigger_schedule
)
}
subject
(
:presenter
)
do
described_class
.
new
(
trigger_schedule
)
end
it
'inherits from Gitlab::View::Presenter::Delegated'
do
expect
(
described_class
.
superclass
).
to
eq
(
Gitlab
::
View
::
Presenter
::
Delegated
)
end
describe
'#initialize'
do
it
'takes a trigger_schedule and optional params'
do
expect
{
presenter
}.
not_to
raise_error
end
it
'exposes trigger_schedule'
do
expect
(
presenter
.
trigger_schedule
).
to
eq
(
trigger_schedule
)
end
it
'forwards missing methods to trigger_schedule'
do
expect
(
presenter
.
ref
).
to
eq
(
'master'
)
end
end
describe
TriggersHelper
do
describe
'#real_next_run'
do
describe
'#real_next_run'
do
let
(
:trigger_schedule
)
{
create
(
:ci_trigger_schedule
,
cron:
user_cron
,
cron_time_zone:
'UTC'
)
}
let
(
:trigger_schedule
)
{
create
(
:ci_trigger_schedule
,
cron:
user_cron
,
cron_time_zone:
'UTC'
)
}
subject
{
helper
.
real_next_run
(
trigger_schedule
,
arguments
)
}
subject
{
described_class
.
new
(
trigger_schedule
).
real_next_run
(
arguments
)
}
context
'when next_run_at > worker_next_time'
do
context
'when next_run_at > worker_next_time'
do
let
(
:arguments
)
{
{
worker_cron:
'0 0 1 1 *'
,
worker_time_zone:
'UTC'
}
}
# every 00:00, January 1st
let
(
:arguments
)
{
{
worker_cron:
'0 0 1 1 *'
,
worker_time_zone:
'UTC'
}
}
# every 00:00, January 1st
...
...
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