Commit c4c08669 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'revert-gold-trial-mrs' into 'master'

Revert Gold Trial MRs

See merge request gitlab-org/gitlab-ee!8726
parents b3596fbd a5f97dba
import Visibility from 'visibilityjs'; import Visibility from 'visibilityjs';
import Vue from 'vue'; import Vue from 'vue';
import PersistentUserCallout from '../persistent_user_callout'; import initDismissableCallout from '~/dismissable_callout';
import { s__, sprintf } from '../locale'; import { s__, sprintf } from '../locale';
import Flash from '../flash'; import Flash from '../flash';
import Poll from '../lib/utils/poll'; import Poll from '../lib/utils/poll';
...@@ -67,7 +67,7 @@ export default class Clusters { ...@@ -67,7 +67,7 @@ export default class Clusters {
this.showTokenButton = document.querySelector('.js-show-cluster-token'); this.showTokenButton = document.querySelector('.js-show-cluster-token');
this.tokenField = document.querySelector('.js-cluster-token'); this.tokenField = document.querySelector('.js-cluster-token');
Clusters.initDismissableCallout(); initDismissableCallout('.js-cluster-security-warning');
initSettingsPanels(); initSettingsPanels();
setupToggleButtons(document.querySelector('.js-cluster-enable-toggle-area')); setupToggleButtons(document.querySelector('.js-cluster-enable-toggle-area'));
this.initApplications(clusterType); this.initApplications(clusterType);
...@@ -108,12 +108,6 @@ export default class Clusters { ...@@ -108,12 +108,6 @@ export default class Clusters {
}); });
} }
static initDismissableCallout() {
const callout = document.querySelector('.js-cluster-security-warning');
if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new
}
addListeners() { addListeners() {
if (this.showTokenButton) this.showTokenButton.addEventListener('click', this.showToken); if (this.showTokenButton) this.showTokenButton.addEventListener('click', this.showToken);
eventHub.$on('installApplication', this.installApplication); eventHub.$on('installApplication', this.installApplication);
......
import $ from 'jquery';
import axios from '~/lib/utils/axios_utils';
import { __ } from '~/locale';
import Flash from '~/flash';
export default function initDismissableCallout(alertSelector) {
const alertEl = document.querySelector(alertSelector);
if (!alertEl) {
return;
}
const closeButtonEl = alertEl.getElementsByClassName('close')[0];
const { dismissEndpoint, featureId } = closeButtonEl.dataset;
closeButtonEl.addEventListener('click', () => {
axios
.post(dismissEndpoint, {
feature_name: featureId,
})
.then(() => {
$(alertEl).alert('close');
})
.catch(() => {
Flash(__('An error occurred while dismissing the alert. Refresh the page and try again.'));
});
});
}
import PersistentUserCallout from '~/persistent_user_callout'; import initDismissableCallout from '~/dismissable_callout';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const callout = document.querySelector('.gcp-signup-offer'); initDismissableCallout('.gcp-signup-offer');
if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new
}); });
import PersistentUserCallout from '~/persistent_user_callout'; import initDismissableCallout from '~/dismissable_callout';
import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; import initGkeDropdowns from '~/projects/gke_cluster_dropdowns';
function initCallout() {
const callout = document.querySelector('.gcp-signup-offer');
if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new
}
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const { page } = document.body.dataset; const { page } = document.body.dataset;
const newClusterViews = [ const newClusterViews = [
...@@ -16,7 +10,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -16,7 +10,7 @@ document.addEventListener('DOMContentLoaded', () => {
]; ];
if (newClusterViews.indexOf(page) > -1) { if (newClusterViews.indexOf(page) > -1) {
initCallout(); initDismissableCallout('.gcp-signup-offer');
initGkeDropdowns(); initGkeDropdowns();
} }
}); });
import PersistentUserCallout from '~/persistent_user_callout'; import initDismissableCallout from '~/dismissable_callout';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const callout = document.querySelector('.gcp-signup-offer'); initDismissableCallout('.gcp-signup-offer');
if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new
}); });
import initDismissableCallout from '~/dismissable_callout';
import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; import initGkeDropdowns from '~/projects/gke_cluster_dropdowns';
import PersistentUserCallout from '../../persistent_user_callout';
import Project from './project'; import Project from './project';
import ShortcutsNavigation from '../../behaviors/shortcuts/shortcuts_navigation'; import ShortcutsNavigation from '../../behaviors/shortcuts/shortcuts_navigation';
...@@ -12,9 +12,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -12,9 +12,7 @@ document.addEventListener('DOMContentLoaded', () => {
]; ];
if (newClusterViews.indexOf(page) > -1) { if (newClusterViews.indexOf(page) > -1) {
const callout = document.querySelector('.gcp-signup-offer'); initDismissableCallout('.gcp-signup-offer');
if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new
initGkeDropdowns(); initGkeDropdowns();
} }
......
// if the "projects dashboard" is a user's default dashboard, when they visit the
// instance root index, the dashboard will be served by the root controller instead
// of a dashboard controller. The root index redirects for all other default dashboards.
import '../dashboard/projects/index';
import axios from './lib/utils/axios_utils';
import { __ } from './locale';
import Flash from './flash';
export default class PersistentUserCallout {
constructor(container) {
const { dismissEndpoint, featureId } = container.dataset;
this.container = container;
this.dismissEndpoint = dismissEndpoint;
this.featureId = featureId;
this.init();
}
init() {
const closeButton = this.container.querySelector('.js-close');
closeButton.addEventListener('click', event => this.dismiss(event));
}
dismiss(event) {
event.preventDefault();
axios
.post(this.dismissEndpoint, {
feature_name: this.featureId,
})
.then(() => {
this.container.remove();
})
.catch(() => {
Flash(__('An error occurred while dismissing the alert. Refresh the page and try again.'));
});
}
}
# frozen_string_literal: true # frozen_string_literal: true
module DashboardHelper module DashboardHelper
prepend EE::DashboardHelper
def assigned_issues_dashboard_path def assigned_issues_dashboard_path
issues_dashboard_path(assignee_username: current_user.username) issues_dashboard_path(assignee_username: current_user.username)
end end
......
# frozen_string_literal: true # frozen_string_literal: true
module UserCalloutsHelper module UserCalloutsHelper
prepend EE::UserCalloutsHelper
GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'.freeze GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'.freeze
GCP_SIGNUP_OFFER = 'gcp_signup_offer'.freeze GCP_SIGNUP_OFFER = 'gcp_signup_offer'.freeze
......
# frozen_string_literal: true # frozen_string_literal: true
module UsersHelper module UsersHelper
prepend EE::UsersHelper
def user_link(user) def user_link(user)
link_to(user.name, user_path(user), link_to(user.name, user_path(user),
title: user.email, title: user.email,
......
- link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer') - link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer')
.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } } .bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert' }
%button.close.js-close{ type: "button" } × %button.close{ type: "button", data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } } ×
.gcp-signup-offer--content .gcp-signup-offer--content
.gcp-signup-offer--icon.append-right-8 .gcp-signup-offer--icon.append-right-8
= sprite_icon("information", size: 16) = sprite_icon("information", size: 16)
......
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity") = auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity")
= render_if_exists "shared/gold_trial_callout"
- page_title "Activity" - page_title "Activity"
- header_title "Activity", activity_dashboard_path - header_title "Activity", activity_dashboard_path
......
- @hide_top_links = true - @hide_top_links = true
- page_title "Groups" - page_title "Groups"
- header_title "Groups", dashboard_groups_path - header_title "Groups", dashboard_groups_path
= render_if_exists "shared/gold_trial_callout"
= render 'dashboard/groups_head' = render 'dashboard/groups_head'
- if params[:filter].blank? && @groups.empty? - if params[:filter].blank? && @groups.empty?
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues") = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues")
= render_if_exists "shared/gold_trial_callout"
.page-title-holder .page-title-holder
%h1.page-title= _('Issues') %h1.page-title= _('Issues')
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
- page_title _("Merge Requests") - page_title _("Merge Requests")
- @breadcrumb_link = merge_requests_dashboard_path(assignee_username: current_user.username) - @breadcrumb_link = merge_requests_dashboard_path(assignee_username: current_user.username)
= render_if_exists "shared/gold_trial_callout"
.page-title-holder .page-title-holder
%h1.page-title= _('Merge Requests') %h1.page-title= _('Merge Requests')
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity") = auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity")
= render_if_exists "shared/gold_trial_callout"
- page_title "Projects" - page_title "Projects"
- header_title "Projects", dashboard_projects_path - header_title "Projects", dashboard_projects_path
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
- page_title "Starred Projects" - page_title "Starred Projects"
- header_title "Projects", dashboard_projects_path - header_title "Projects", dashboard_projects_path
= render_if_exists "shared/gold_trial_callout"
%div{ class: container_class } %div{ class: container_class }
= render "projects/last_push" = render "projects/last_push"
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
- page_title "Todos" - page_title "Todos"
- header_title "Todos", dashboard_todos_path - header_title "Todos", dashboard_todos_path
= render_if_exists "shared/gold_trial_callout"
.page-title-holder .page-title-holder
%h1.page-title= _('Todos') %h1.page-title= _('Todos')
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
- page_title _("Groups") - page_title _("Groups")
- header_title _("Groups"), dashboard_groups_path - header_title _("Groups"), dashboard_groups_path
= render_if_exists "shared/gold_trial_callout"
- if current_user - if current_user
= render 'dashboard/groups_head' = render 'dashboard/groups_head'
- else - else
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
- page_title _("Projects") - page_title _("Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout"
- if current_user - if current_user
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
- else - else
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
- page_title _("Projects") - page_title _("Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout"
- if current_user - if current_user
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
- else - else
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
- page_title _("Projects") - page_title _("Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout"
- if current_user - if current_user
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
- else - else
......
import PersistentUserCallout from '~/persistent_user_callout';
document.addEventListener('DOMContentLoaded', () => {
const callout = document.querySelector('.js-gold-trial-callout');
if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new
});
// if the "projects dashboard" is a user's default dashboard, when they visit the
// instance root index, the dashboard will be served by the root controller instead
// of a dashboard controller. The root index redirects for all other default dashboards.
import '~/pages/root/index';
import '../dashboard/index';
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
} }
.svg-container { .svg-container {
margin-right: $gl-padding; margin-right: 15px;
} }
} }
...@@ -77,24 +77,6 @@ ...@@ -77,24 +77,6 @@
margin: 0; margin: 0;
} }
} }
&.thin-callout {
.bordered-box {
padding: $gl-padding;
padding-left: 40px;
.close {
position: relative;
top: 0;
right: 0;
}
}
.svg-container .svg {
max-width: 39px;
max-height: 39px;
}
}
} }
.promotion-modal { .promotion-modal {
......
# frozen_string_literal: true
module EE
module DashboardHelper
def controller_action_to_child_dashboards(controller = controller_name, action = action_name)
case "#{controller}##{action}"
when 'projects#index', 'root#index', 'projects#starred', 'projects#trending'
%w(projects)
when 'dashboard#activity'
%w(starred_project_activity project_activity)
when 'groups#index'
%w(groups)
when 'todos#index'
%w(todos)
when 'dashboard#issues'
%w(issues)
when 'dashboard#merge_requests'
%w(merge_requests)
else
[]
end
end
def user_default_dashboard?(user = current_user)
return false unless user
controller_action_to_child_dashboards.any? { |dashboard| dashboard == user.dashboard }
end
end
end
# frozen_string_literal: true
module EE
module UserCalloutsHelper
GOLD_TRIAL = 'gold_trial'
def show_gold_trial?(user = current_user)
return false if user_dismissed?(GOLD_TRIAL)
return false unless show_gold_trial_suitable_env?
users_namespaces_clean?(user)
end
def show_gold_trial_suitable_env?
(::Gitlab.com? || Rails.env.development?) &&
!::Gitlab::Database.read_only?
end
def users_namespaces_clean?(user)
return false if user.any_namespace_with_gold?
!user.any_namespace_with_trial?
end
end
end
...@@ -190,36 +190,11 @@ module EE ...@@ -190,36 +190,11 @@ module EE
project_creation_level: project_creation_levels) project_creation_level: project_creation_levels)
end end
def any_namespace_with_trial?
::Namespace
.from("(#{namespace_union(:trial_ends_on)}) #{::Namespace.table_name}")
.where('trial_ends_on > ?', Time.now.utc)
.any?
end
def any_namespace_with_gold?
::Namespace
.includes(:plan)
.where("namespaces.id IN (#{namespace_union})") # rubocop:disable GitlabSecurity/SqlInjection
.where.not(plans: { id: nil })
.any?
end
override :has_current_license? override :has_current_license?
def has_current_license? def has_current_license?
License.current.present? License.current.present?
end end
def group_sso?(group)
return false unless group
if group_saml_identities.loaded?
group_saml_identities.any? { |identity| identity.saml_provider.group_id == group.id }
else
group_saml_identities.where(saml_provider: group.saml_provider).any?
end
end
override :ldap_sync_time override :ldap_sync_time
def ldap_sync_time def ldap_sync_time
::Gitlab.config.ldap['sync_time'] ::Gitlab.config.ldap['sync_time']
...@@ -229,13 +204,14 @@ module EE ...@@ -229,13 +204,14 @@ module EE
update_column :admin_email_unsubscribed_at, Time.now update_column :admin_email_unsubscribed_at, Time.now
end end
private def group_sso?(group)
return false unless group
def namespace_union(select = :id) if group_saml_identities.loaded?
::Gitlab::SQL::Union.new([ group_saml_identities.any? { |identity| identity.saml_provider.group_id == group.id }
::Namespace.select(select).where(type: nil, owner: self), else
owned_groups.select(select).where(parent_id: nil) group_saml_identities.where(saml_provider: group.saml_provider).any?
]).to_sql end
end end
end end
end end
- if user_default_dashboard? && show_gold_trial?
.pt-1.d-none.d-md-block{ class: container_class }
.user-callout.promotion-callout.thin-callout.js-gold-trial-callout{ data: { uid: 'trial_callout_dismissed', feature_id: UserCalloutsHelper::GOLD_TRIAL, dismiss_endpoint: user_callouts_path } }
.bordered-box.justify-content-left.align-items-center
.svg-container
= image_tag 'illustrations/golden_tanuki.svg', class: 'svg'
.d-flex.flex-grow.align-items-center
.user-callout-copy.ml-0
%h5.mb-0.mt-0= _('Free Trial of GitLab.com Gold')
%p.mb-0
%span= _('Try all GitLab has to offer for 30 days.')
%span.d-none.d-sm-inline= _('No credit card required.')
= link_to _('Start your trial'), 'https://customers.gitlab.com/trials/new?gl_com=true', class: 'btn btn-primary mr-3 mt-2 mt-sm-0', target: '_blank'
%button.btn.btn-default.close.js-close{ type: 'button',
'aria-label' => _('Dismiss trial promotion') }
= sprite_icon('close', css_class: 'dismiss-icon')
---
title: Promote starting a GitLab.com Gold trial on the dashboard
merge_request: 6947
author:
type: other
require 'spec_helper'
describe 'Dashboard activity' do
let(:user) { create(:user) }
let(:page_path) { activity_dashboard_path }
it_behaves_like 'gold trial callout'
end
require 'spec_helper'
describe 'Dashboard groups' do
let(:user) { create(:user) }
let(:page_path) { dashboard_groups_path }
it_behaves_like 'gold trial callout'
end
require 'spec_helper'
describe 'Dashboard issues' do
let(:user) { create(:user) }
let(:page_path) { issues_dashboard_path }
it_behaves_like 'gold trial callout'
end
require 'spec_helper'
describe 'Dashboard merge requests' do
let(:user) { create(:user) }
let(:page_path) { merge_requests_dashboard_path }
it_behaves_like 'gold trial callout'
end
require 'spec_helper'
describe 'Dashboard projects' do
let(:user) { create(:user) }
let(:page_path) { dashboard_projects_path }
it_behaves_like 'gold trial callout'
end
require 'spec_helper'
describe 'Dashboard todos' do
let(:user) { create(:user) }
let(:page_path) { dashboard_todos_path }
it_behaves_like 'gold trial callout'
end
# frozen_string_literal: true
require 'spec_helper'
describe EE::UserCalloutsHelper do
let(:user) { create(:user) }
before do
allow(helper).to receive(:current_user).and_return(user)
end
describe '.show_gold_trial?' do
let(:suitable_env) { nil }
before do
allow(helper).to receive(:user_dismissed?).with(described_class::GOLD_TRIAL).and_return(user_dismissed)
allow(helper).to receive(:show_gold_trial_suitable_env?).and_return(suitable_env)
end
context 'when user has already dismissed the callout' do
let(:user_dismissed) { true }
it 'returns false' do
expect(helper.show_gold_trial?).to be_falsey
end
end
context 'when show_gold_trial_suitable_env? returns false' do
let(:user_dismissed) { false }
let(:suitable_env) { false }
it 'returns false' do
expect(helper.show_gold_trial?).to be_falsey
end
end
context 'when show_gold_trial_namespaces_checked?' do
let(:user_dismissed) { false }
let(:suitable_env) { true }
before do
allow(helper).to receive(:users_namespaces_clean?).and_return(namespaces_checked)
end
context 'returns false' do
let(:namespaces_checked) { false }
it 'returns false' do
expect(helper.show_gold_trial?).to be_falsey
end
end
context 'returns true' do
let(:namespaces_checked) { true }
it 'returns true' do
expect(helper.show_gold_trial?).to be_truthy
end
end
end
end
describe '.show_gold_trial_suitable_env?' do
before do
allow(Gitlab).to receive(:com?).and_return(gitlab_com)
allow(Rails.env).to receive(:development?).and_return(rails_dev_env)
allow(Gitlab::Database).to receive(:read_only?).and_return(db_read_only)
end
context 'with a writable DB' do
let(:db_read_only) { false }
context "when we're neither GitLab.com or a Rails development env" do
let(:gitlab_com) { false }
let(:rails_dev_env) { false }
it 'returns true' do
expect(helper.show_gold_trial_suitable_env?).to be_falsey
end
end
context "when we're GitLab.com" do
let(:gitlab_com) { true }
let(:rails_dev_env) { false }
it 'returns true' do
expect(helper.show_gold_trial_suitable_env?).to be_truthy
end
end
context "when we're a Rails development env" do
let(:gitlab_com) { false }
let(:rails_dev_env) { true }
it 'returns true' do
expect(helper.show_gold_trial_suitable_env?).to be_truthy
end
end
end
context 'with a readonly DB' do
let(:db_read_only) { true }
context "when we're GitLab.com" do
let(:gitlab_com) { true }
let(:rails_dev_env) { false }
it 'returns true' do
expect(helper.show_gold_trial_suitable_env?).to be_falsey
end
end
context "when we're a Rails development env" do
let(:gitlab_com) { false }
let(:rails_dev_env) { true }
it 'returns true' do
expect(helper.show_gold_trial_suitable_env?).to be_falsey
end
end
end
end
describe '.show_gold_trial_namespaces_checked?' do
let(:a_name_space_has_trial) { nil }
before do
allow(user).to receive(:any_namespace_with_gold?).and_return(a_name_space_has_gold)
allow(user).to receive(:any_namespace_with_trial?).and_return(a_name_space_has_trial)
end
context "when a user's namespace has gold" do
let(:a_name_space_has_gold) { true }
it 'returns false' do
expect(helper.users_namespaces_clean?(user)).to be_falsey
end
end
context "when a user's namespace does not have gold" do
let(:a_name_space_has_gold) { false }
context "but a user's namespace has a trial" do
let(:a_name_space_has_trial) { true }
it 'returns false' do
expect(helper.users_namespaces_clean?(user)).to be_falsey
end
end
context "and does not have a trial" do
let(:a_name_space_has_trial) { false }
it 'returns true' do
expect(helper.users_namespaces_clean?(user)).to be_truthy
end
end
end
end
end
shared_examples 'gold trial callout' do
before do
sign_in(user)
end
it 'hides promotion callout if not .com' do
allow(Gitlab).to receive(:com?).and_return(false)
visit page_path
expect(page).not_to have_selector '.promotion-callout'
end
context '.com' do
before do
allow(Gitlab).to receive(:com?).and_return(true)
end
it 'shows dismissable promotion callout if default dashboard', :js do
allow_any_instance_of(EE::DashboardHelper).to receive(:user_default_dashboard?).and_return(true)
visit page_path
expect(page).to have_selector '.promotion-callout'
find('.js-close').click
expect(page).not_to have_selector '.promotion-callout'
end
it 'hides dismissable promotion callout if not default dashboard', :js do
allow_any_instance_of(EE::DashboardHelper).to receive(:user_default_dashboard?).and_return(false)
visit page_path
expect(page).not_to have_selector '.promotion-callout'
end
it 'hides promotion callout if a trial is active' do
group = create(:group, name: 'trial group', trial_ends_on: 1.year.from_now)
group.add_owner(user)
visit page_path
expect(page).not_to have_selector '.promotion-callout'
end
it 'hides promotion callout if a gold plan is active', :js do
group = create(:group, name: 'gold group', plan: :gold_plan)
group.add_owner(user)
visit page_path
expect(page).not_to have_selector '.promotion-callout'
end
it 'hides promotion callout if database is in a readonly state' do
allow(Gitlab::Database).to receive(:read_only?).and_return(true)
expect(page).not_to have_selector '.promotion-callout'
end
end
end
...@@ -2980,9 +2980,6 @@ msgstr "" ...@@ -2980,9 +2980,6 @@ msgstr ""
msgid "Dismiss Merge Request promotion" msgid "Dismiss Merge Request promotion"
msgstr "" msgstr ""
msgid "Dismiss trial promotion"
msgstr ""
msgid "Do you want to customize how Google Code email addresses and usernames are imported into GitLab?" msgid "Do you want to customize how Google Code email addresses and usernames are imported into GitLab?"
msgstr "" msgstr ""
...@@ -3718,9 +3715,6 @@ msgstr "" ...@@ -3718,9 +3715,6 @@ msgstr ""
msgid "Found errors in your .gitlab-ci.yml:" msgid "Found errors in your .gitlab-ci.yml:"
msgstr "" msgstr ""
msgid "Free Trial of GitLab.com Gold"
msgstr ""
msgid "From %{provider_title}" msgid "From %{provider_title}"
msgstr "" msgstr ""
...@@ -5717,9 +5711,6 @@ msgstr "" ...@@ -5717,9 +5711,6 @@ msgstr ""
msgid "No contributions were found" msgid "No contributions were found"
msgstr "" msgstr ""
msgid "No credit card required."
msgstr ""
msgid "No due date" msgid "No due date"
msgstr "" msgstr ""
...@@ -8077,9 +8068,6 @@ msgstr "" ...@@ -8077,9 +8068,6 @@ msgstr ""
msgid "Start the Runner!" msgid "Start the Runner!"
msgstr "" msgstr ""
msgid "Start your trial"
msgstr ""
msgid "Started" msgid "Started"
msgstr "" msgstr ""
...@@ -9001,9 +8989,6 @@ msgstr "" ...@@ -9001,9 +8989,6 @@ msgstr ""
msgid "Try again?" msgid "Try again?"
msgstr "" msgstr ""
msgid "Try all GitLab has to offer for 30 days."
msgstr ""
msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now." msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now."
msgstr "" msgstr ""
......
...@@ -6,7 +6,6 @@ describe 'Dashboard Merge Requests' do ...@@ -6,7 +6,6 @@ describe 'Dashboard Merge Requests' do
include ProjectForksHelper include ProjectForksHelper
let(:current_user) { create :user } let(:current_user) { create :user }
let(:user) { current_user }
let(:project) { create(:project) } let(:project) { create(:project) }
let(:public_project) { create(:project, :public, :repository) } let(:public_project) { create(:project, :public, :repository) }
......
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