Merge branch…

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

Merge branch…
38b3064c · Robert Speicher · 5578506e · 67d3d0a4 · 38b3064c
Commit 38b3064c authored Jun 05, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

header_component_spec.js spec/javascripts/pipelines/header_component_spec.js +4 -1

No files found.
--- 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',