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
043f899b
Commit
043f899b
authored
Oct 06, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rails 5: fix mysql milliseconds problems in scheduled build specs
parent
50c9a09a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
changelogs/unreleased/rails5-mysql-schedule-build.yml
changelogs/unreleased/rails5-mysql-schedule-build.yml
+5
-0
spec/lib/gitlab/ci/status/build/scheduled_spec.rb
spec/lib/gitlab/ci/status/build/scheduled_spec.rb
+1
-1
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+1
-1
spec/presenters/ci/build_presenter_spec.rb
spec/presenters/ci/build_presenter_spec.rb
+1
-1
No files found.
changelogs/unreleased/rails5-mysql-schedule-build.yml
0 → 100644
View file @
043f899b
---
title
:
'
Rails
5:
fix
mysql
milliseconds
problems
in
scheduled
build
specs'
merge_request
:
22170
author
:
Jasper Maes
type
:
other
spec/lib/gitlab/ci/status/build/scheduled_spec.rb
View file @
043f899b
...
@@ -17,7 +17,7 @@ describe Gitlab::Ci::Status::Build::Scheduled do
...
@@ -17,7 +17,7 @@ describe Gitlab::Ci::Status::Build::Scheduled do
let
(
:build
)
{
create
(
:ci_build
,
scheduled_at:
1
.
minute
.
since
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
scheduled_at:
1
.
minute
.
since
,
project:
project
)
}
it
'shows execute_in of the scheduled job'
do
it
'shows execute_in of the scheduled job'
do
Timecop
.
freeze
do
Timecop
.
freeze
(
Time
.
now
.
change
(
usec:
0
))
do
expect
(
subject
.
status_tooltip
).
to
include
(
'00:01:00'
)
expect
(
subject
.
status_tooltip
).
to
include
(
'00:01:00'
)
end
end
end
end
...
...
spec/models/ci/build_spec.rb
View file @
043f899b
...
@@ -261,7 +261,7 @@ describe Ci::Build do
...
@@ -261,7 +261,7 @@ describe Ci::Build do
it
'schedules BuildScheduleWorker at the right time'
do
it
'schedules BuildScheduleWorker at the right time'
do
Timecop
.
freeze
do
Timecop
.
freeze
do
expect
(
Ci
::
BuildScheduleWorker
)
expect
(
Ci
::
BuildScheduleWorker
)
.
to
receive
(
:perform_at
).
with
(
1
.
minute
.
since
,
build
.
id
)
.
to
receive
(
:perform_at
).
with
(
be_like_time
(
1
.
minute
.
since
)
,
build
.
id
)
subject
subject
end
end
...
...
spec/presenters/ci/build_presenter_spec.rb
View file @
043f899b
...
@@ -227,7 +227,7 @@ describe Ci::BuildPresenter do
...
@@ -227,7 +227,7 @@ describe Ci::BuildPresenter do
it
'returns execution time'
do
it
'returns execution time'
do
Timecop
.
freeze
do
Timecop
.
freeze
do
is_expected
.
to
eq
(
60.0
)
is_expected
.
to
be_like_time
(
60.0
)
end
end
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