Commit 1a90632c authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-flacky-test-jobs-spec' into 'master'

[broken master] Fix time dependent jobs spec

See merge request gitlab-org/gitlab-ce!22159
parents 81e435c4 71961608
...@@ -568,12 +568,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -568,12 +568,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
end end
it 'shows delayed job', :js do it 'shows delayed job', :js do
time_diff = [0, job.scheduled_at - Time.now].max
expect(page).to have_content(job.detailed_status(user).illustration[:title])
expect(page).to have_content('This is a scheduled to run in') expect(page).to have_content('This is a scheduled to run in')
expect(page).to have_content("This job will automatically run after it's timer finishes.") expect(page).to have_content("This job will automatically run after it's timer finishes.")
expect(page).to have_content(Time.at(time_diff).utc.strftime("%H:%M:%S"))
expect(page).to have_link('Unschedule job') expect(page).to have_link('Unschedule job')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment