Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changes

7 files changed, 50 insertions, 3 deletions

diff --git a/spec/javascripts/commit/pipelines/pipelines_spec.js b/spec/javascripts/commit/pipelines/pipelines_spec.js
index a34cadec0ab..454f187ccbc 100644
--- a/spec/javascripts/commit/pipelines/pipelines_spec.js
+++ b/spec/javascripts/commit/pipelines/pipelines_spec.js
@@ -29,6 +29,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
           propsData: {
             endpoint: 'endpoint',
             helpPagePath: 'foo',
+            autoDevopsHelpPath: 'foo',
           },
         }).$mount();
       });
@@ -64,6 +65,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
           propsData: {
             endpoint: 'endpoint',
             helpPagePath: 'foo',
+            autoDevopsHelpPath: 'foo',
           },
         }).$mount();
       });
@@ -115,6 +117,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
           propsData: {
             endpoint: 'endpoint',
             helpPagePath: 'foo',
+            autoDevopsHelpPath: 'foo',
           },
         }).$mount();
         element.appendChild(this.component.$el);
@@ -136,6 +139,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
         propsData: {
           endpoint: 'endpoint',
           helpPagePath: 'foo',
+          autoDevopsHelpPath: 'foo',
         },
       }).$mount();
     });
diff --git a/spec/javascripts/pipelines/pipeline_url_spec.js b/spec/javascripts/pipelines/pipeline_url_spec.js
index 3c4b20a5f06..256fdbe743c 100644
--- a/spec/javascripts/pipelines/pipeline_url_spec.js
+++ b/spec/javascripts/pipelines/pipeline_url_spec.js
@@ -16,6 +16,7 @@ describe('Pipeline Url Component', () => {
           path: 'foo',
           flags: {},
         },
+        autoDevopsHelpPath: 'foo',
       },
     }).$mount();
 
@@ -30,6 +31,7 @@ describe('Pipeline Url Component', () => {
           path: 'foo',
           flags: {},
         },
+        autoDevopsHelpPath: 'foo',
       },
     }).$mount();
 
@@ -50,6 +52,7 @@ describe('Pipeline Url Component', () => {
           path: '/',
         },
       },
+      autoDevopsHelpPath: 'foo',
     };
 
     const component = new PipelineUrlComponent({
@@ -73,6 +76,7 @@ describe('Pipeline Url Component', () => {
           path: 'foo',
           flags: {},
         },
+        autoDevopsHelpPath: 'foo',
       },
     }).$mount();
 
@@ -91,6 +95,7 @@ describe('Pipeline Url Component', () => {
             stuck: true,
           },
         },
+        autoDevopsHelpPath: 'foo',
       },
     }).$mount();
 
@@ -98,4 +103,26 @@ describe('Pipeline Url Component', () => {
     expect(component.$el.querySelector('.js-pipeline-url-yaml').textContent).toContain('yaml invalid');
     expect(component.$el.querySelector('.js-pipeline-url-stuck').textContent).toContain('stuck');
   });
+
+  it('should render a badge for autodevops', () => {
+    const component = new PipelineUrlComponent({
+      propsData: {
+        pipeline: {
+          id: 1,
+          path: 'foo',
+          flags: {
+            latest: true,
+            yaml_errors: true,
+            stuck: true,
+            auto_devops: true,
+          },
+        },
+        autoDevopsHelpPath: 'foo',
+      },
+    }).$mount();
+
+    expect(
+      component.$el.querySelector('.js-pipeline-url-autodevops').textContent.trim(),
+    ).toEqual('Auto DevOps');
+  });
 });
diff --git a/spec/javascripts/pipelines/pipelines_table_row_spec.js b/spec/javascripts/pipelines/pipelines_table_row_spec.js
index 7ce39dca112..d7456a48bc1 100644
--- a/spec/javascripts/pipelines/pipelines_table_row_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_row_spec.js
@@ -9,7 +9,7 @@ describe('Pipelines Table Row', () => {
       el: document.querySelector('.test-dom-element'),
       propsData: {
         pipeline,
-        service: {},
+        autoDevopsHelpPath: 'foo',
       },
     }).$mount();
   };
diff --git a/spec/javascripts/pipelines/pipelines_table_spec.js b/spec/javascripts/pipelines/pipelines_table_spec.js
index 3afe89c8db4..4f5eb42eb35 100644
--- a/spec/javascripts/pipelines/pipelines_table_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_spec.js
@@ -22,6 +22,7 @@ describe('Pipelines Table', () => {
       component = new PipelinesTableComponent({
         propsData: {
           pipelines: [],
+          autoDevopsHelpPath: 'foo',
         },
       }).$mount();
     });
@@ -47,6 +48,7 @@ describe('Pipelines Table', () => {
       const component = new PipelinesTableComponent({
         propsData: {
           pipelines: [],
+          autoDevopsHelpPath: 'foo',
         },
       }).$mount();
       expect(component.$el.querySelectorAll('.commit.gl-responsive-table-row').length).toEqual(0);
@@ -58,6 +60,7 @@ describe('Pipelines Table', () => {
       const component = new PipelinesTableComponent({
         propsData: {
           pipelines: [pipeline],
+          autoDevopsHelpPath: 'foo',
         },
       }).$mount();
 
diff --git a/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js b/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
index 59fc2dedba5..67f8a8946c2 100644
--- a/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
+++ b/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
@@ -43,7 +43,7 @@ describe('ProjectsListSearchComponent', () => {
         expect(vm.listEmptyMessage).toBe('Something went wrong on our end.');
 
         vm.searchFailed = false;
-        expect(vm.listEmptyMessage).toBe('No projects matched your query');
+        expect(vm.listEmptyMessage).toBe('Sorry, no projects matched your search');
       });
     });
   });
diff --git a/spec/javascripts/projects_dropdown/components/search_spec.js b/spec/javascripts/projects_dropdown/components/search_spec.js
index f2a23e33325..24d8a00b254 100644
--- a/spec/javascripts/projects_dropdown/components/search_spec.js
+++ b/spec/javascripts/projects_dropdown/components/search_spec.js
@@ -94,7 +94,7 @@ describe('SearchComponent', () => {
       expect(vm.$el.classList.contains('search-input-container')).toBeTruthy();
       expect(vm.$el.classList.contains('hidden-xs')).toBeTruthy();
       expect(inputEl).not.toBe(null);
-      expect(inputEl.getAttribute('placeholder')).toBe('Search projects');
+      expect(inputEl.getAttribute('placeholder')).toBe('Search your projects');
       expect(vm.$el.querySelector('.search-icon')).toBeDefined();
     });
   });
diff --git a/spec/javascripts/user_callout_spec.js b/spec/javascripts/user_callout_spec.js
index 28d0c7dcd99..69cb93bd850 100644
--- a/spec/javascripts/user_callout_spec.js
+++ b/spec/javascripts/user_callout_spec.js
@@ -33,4 +33,17 @@ describe('UserCallout', function () {
     this.userCalloutBtn.click();
     expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
   });
+
+  describe('Sets cookie with setCalloutPerProject', () => {
+    beforeEach(() => {
+      spyOn(Cookies, 'set').and.callFake(() => {});
+      document.querySelector('.user-callout').setAttribute('data-project-path', 'foo/bar');
+      this.userCallout = new UserCallout({ setCalloutPerProject: true });
+    });
+
+    it('sets a cookie when the user clicks the close button', () => {
+      this.userCalloutBtn.click();
+      expect(Cookies.set).toHaveBeenCalledWith('user_callout_dismissed', 'true', Object({ expires: 365, path: 'foo/bar' }));
+    });
+  });
 });