diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-05 22:57:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-05 22:57:54 +0000 |
| commit | 38b3064c25bcf0aff900969d5cddbc3bde1b106a (patch) | |
| tree | 7007166aefdf0a4a82a1f4c9ea8b575f5e8ea289 | |
| parent | 5578506eb1e7e911fa7b283e81b3751be370977b (diff) | |
| parent | 67d3d0a488bf7db6bab7b07495f227984e9b6bc4 (diff) | |
| download | gitlab-ce-38b3064c25bcf0aff900969d5cddbc3bde1b106a.tar.gz | |
Merge branch '33321-spec-failure-in-spec-javascripts-pipelines-header_component_spec-js-46-expected-failed-pipeline-123-triggered-4-weeks-ago-by-foo-to-equal-failed-pipeline-123-triggered-3-weeks-ago-by-foo' into 'master'
Resolve "Spec failure in spec/javascripts/pipelines/header_component_spec.js:46 : Expected 'failed Pipeline #123 triggered 4 weeks ago by Foo' to equal 'failed Pipeline #123 triggered 3 weeks ago by Foo'."
Closes #33321
See merge request !11915
| -rw-r--r-- | spec/javascripts/pipelines/header_component_spec.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/javascripts/pipelines/header_component_spec.js b/spec/javascripts/pipelines/header_component_spec.js index b8531350e43..cecc7ceb53d 100644 --- a/spec/javascripts/pipelines/header_component_spec.js +++ b/spec/javascripts/pipelines/header_component_spec.js @@ -10,6 +10,9 @@ describe('Pipeline details header', () => { beforeEach(() => { HeaderComponent = Vue.extend(headerComponent); + const threeWeeksAgo = new Date(); + threeWeeksAgo.setDate(threeWeeksAgo.getDate() - 21); + props = { pipeline: { details: { @@ -22,7 +25,7 @@ describe('Pipeline details header', () => { }, }, id: 123, - created_at: '2017-05-08T14:57:39.781Z', + created_at: threeWeeksAgo.toISOString(), user: { web_url: 'path', name: 'Foo', |