Merge branch '38088-remove-banner-to-customize-experience' into 'master'

Resolve "Remove banner to customize experience"

Closes #38088

See merge request gitlab-org/gitlab-ce!14384

6 files changed, 0 insertions, 157 deletions

diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml
index c546252455a..a4dc49d2120 100644
--- a/app/views/dashboard/projects/index.html.haml
+++ b/app/views/dashboard/projects/index.html.haml
@@ -10,9 +10,6 @@
 = render "projects/last_push"
 
 %div{ class: container_class }
-  - if show_callout?('user_callout_dismissed')
-    = render 'shared/user_callout'
-
   - if has_projects_or_name?(@projects, params)
     = render 'dashboard/projects_head'
     = render 'projects'
diff --git a/app/views/shared/_user_callout.html.haml b/app/views/shared/_user_callout.html.haml
deleted file mode 100644
index 17ffcba69d8..00000000000
--- a/app/views/shared/_user_callout.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-.user-callout{ data: { uid: 'user_callout_dismissed' } }
-  .bordered-box.landing.content-block
-    %button.btn.btn-default.close.js-close-callout{ type: 'button',
-      'aria-label' => 'Dismiss customize experience box' }
-      = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
-    .svg-container
-      = custom_icon('icon_customization')
-    .user-callout-copy
-      %h4
-        Customize your experience
-      %p
-        Change syntax themes, default project pages, and more in preferences.
-      = link_to 'Check it out', profile_preferences_path, class: 'btn btn-primary js-close-callout'
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 879e0f99b14..d0ffcc88d43 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -99,8 +99,6 @@
             Snippets
 
   %div{ class: container_class }
-    - if @user == current_user && show_callout?('user_callout_dismissed')
-      = render 'shared/user_callout'
     .tab-content
       #activity.tab-pane
         .row-content-block.calender-block.white.second-block.hidden-xs
diff --git a/spec/features/user_callout_spec.rb b/spec/features/user_callout_spec.rb
deleted file mode 100644
index 37d66b618af..00000000000
--- a/spec/features/user_callout_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe 'User Callouts', js: true do
-  let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:project) { create(:project, path: 'gitlab', name: 'sample') }
-
-  before do
-    sign_in(user)
-    project.team << [user, :master]
-  end
-
-  it 'takes you to the profile preferences when the link is clicked' do
-    visit dashboard_projects_path
-    click_link 'Check it out'
-    expect(current_path).to eq profile_preferences_path
-  end
-
-  it 'does not show when cookie is set' do
-    visit dashboard_projects_path
-
-    within('.user-callout') do
-      find('.close').trigger('click')
-    end
-
-    visit dashboard_projects_path
-
-    expect(page).not_to have_selector('.user-callout')
-  end
-
-  describe 'user callout should appear in two routes' do
-    it 'shows up on the user profile' do
-      visit user_path(user)
-      expect(find('.user-callout')).to have_content 'Customize your experience'
-    end
-
-    it 'shows up on the dashboard projects' do
-      visit dashboard_projects_path
-      expect(find('.user-callout')).to have_content 'Customize your experience'
-    end
-  end
-
-  it 'hides the user callout when click on the dismiss icon' do
-    visit user_path(user)
-    within('.user-callout') do
-      find('.close').click
-    end
-    expect(page).not_to have_selector('.user-callout')
-  end
-
-  it 'does not show callout on another users profile' do
-    visit user_path(another_user)
-    expect(page).not_to have_selector('.user-callout')
-  end
-end
diff --git a/spec/javascripts/fixtures/dashboard.rb b/spec/javascripts/fixtures/dashboard.rb
deleted file mode 100644
index 7fa351680c9..00000000000
--- a/spec/javascripts/fixtures/dashboard.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe Dashboard::ProjectsController, '(JavaScript fixtures)', type: :controller do
-  include JavaScriptFixturesHelpers
-
-  let(:admin) { create(:admin) }
-  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
-  let(:project) { create(:project, namespace: namespace, path: 'builds-project') }
-
-  render_views
-
-  before(:all) do
-    clean_frontend_fixtures('dashboard/')
-  end
-
-  before do
-    sign_in(admin)
-  end
-
-  after do
-    remove_repository(project)
-  end
-
-  it 'dashboard/user-callout.html.raw' do |example|
-    rendered = render_template('shared/_user_callout')
-    store_frontend_fixture(rendered, example.description)
-  end
-
-  private
-
-  def render_template(template_file_name)
-    controller.prepend_view_path(JavaScriptFixturesHelpers::FIXTURE_PATH)
-    controller.render_to_string(template_file_name, layout: false)
-  end
-end
diff --git a/spec/javascripts/user_callout_spec.js b/spec/javascripts/user_callout_spec.js
deleted file mode 100644
index 69cb93bd850..00000000000
--- a/spec/javascripts/user_callout_spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import Cookies from 'js-cookie';
-import UserCallout from '~/user_callout';
-
-const USER_CALLOUT_COOKIE = 'user_callout_dismissed';
-
-describe('UserCallout', function () {
-  const fixtureName = 'dashboard/user-callout.html.raw';
-  preloadFixtures(fixtureName);
-
-  beforeEach(() => {
-    loadFixtures(fixtureName);
-    Cookies.remove(USER_CALLOUT_COOKIE);
-
-    this.userCallout = new UserCallout();
-    this.closeButton = $('.js-close-callout.close');
-    this.userCalloutBtn = $('.js-close-callout:not(.close)');
-  });
-
-  it('hides when user clicks on the dismiss-icon', (done) => {
-    this.closeButton.click();
-    expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
-
-    setTimeout(() => {
-      expect(
-        document.querySelector('.user-callout'),
-      ).toBeNull();
-
-      done();
-    });
-  });
-
-  it('hides when user clicks on the "check it out" button', () => {
-    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' }));
-    });
-  });
-});