diff options
Diffstat (limited to 'spec/controllers/concerns')
4 files changed, 9 insertions, 40 deletions
diff --git a/spec/controllers/concerns/continue_params_spec.rb b/spec/controllers/concerns/continue_params_spec.rb index 9ac7087430e..a9899447054 100644 --- a/spec/controllers/concerns/continue_params_spec.rb +++ b/spec/controllers/concerns/continue_params_spec.rb @@ -34,7 +34,7 @@ RSpec.describe ContinueParams do strong_continue_params(to: '/hello', notice: 'world', notice_now: '!', something: 'else') end - expect(controller.continue_params.keys).to contain_exactly(*%w(to notice notice_now)) + expect(controller.continue_params.keys).to contain_exactly(*%w[to notice notice_now]) end it 'does not allow cross host redirection' do diff --git a/spec/controllers/concerns/onboarding/status_spec.rb b/spec/controllers/concerns/onboarding/status_spec.rb index fe7c5ac6346..6fcbd059947 100644 --- a/spec/controllers/concerns/onboarding/status_spec.rb +++ b/spec/controllers/concerns/onboarding/status_spec.rb @@ -5,15 +5,8 @@ require 'spec_helper' RSpec.describe Onboarding::Status, feature_category: :onboarding do let_it_be(:member) { create(:group_member) } let_it_be(:user) { member.user } - let_it_be(:tasks_to_be_done) { %w[ci code] } let_it_be(:source) { member.group } - describe '#continue_full_onboarding?' do - subject { described_class.new(nil, {}, user).continue_full_onboarding? } - - it { is_expected.to eq(false) } - end - describe '#single_invite?' do subject { described_class.new(nil, nil, user).single_invite? } diff --git a/spec/controllers/concerns/product_analytics_tracking_spec.rb b/spec/controllers/concerns/product_analytics_tracking_spec.rb index 1394325014b..5c69af48e65 100644 --- a/spec/controllers/concerns/product_analytics_tracking_spec.rb +++ b/spec/controllers/concerns/product_analytics_tracking_spec.rb @@ -10,15 +10,17 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a let(:event_name) { 'an_event' } let(:event_action) { 'an_action' } let(:event_label) { 'a_label' } - let!(:group) { create(:group) } + let_it_be(:project) { create(:project) } + subject(:track_internal_event) { get :show, params: { id: 1 } } + describe '.track_internal_event' do controller(ApplicationController) do include ProductAnalyticsTracking - skip_before_action :authenticate_user!, only: [:show] + skip_before_action :authenticate_user!, only: [:index] track_internal_event :index, :show, name: 'g_compliance_dashboard', conditions: [:custom_condition?] def index @@ -58,8 +60,6 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a context 'when user is logged in' do let(:namespace) { project.namespace } - subject(:track_internal_event) { get :index } - before do sign_in(user) end @@ -83,7 +83,7 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a it 'does not track the event if the format is not HTML' do expect_no_internal_tracking - get :index, format: :json + get :show, params: { id: 1, format: :json } end it 'does not track the event if a custom condition returns false' do @@ -96,34 +96,10 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a end context 'when user is not logged in' do - let(:visitor_id) { SecureRandom.uuid } - - it 'tracks the event when there is a visitor id' do - cookies[:visitor_id] = { value: visitor_id, expires: 24.months } - - expect_internal_tracking(tracked_user: nil) - - get :show, params: { id: 1 } - end - - context 'and there is no visitor_id' do - it 'does not track the event' do - expect_no_internal_tracking - - subject - end - end - end - - context 'when there is no custom_id set' do - before do - allow(controller).to receive(:get_custom_id).and_return(nil) - end - - it 'does not track' do + it 'does not track the event' do expect_no_internal_tracking - subject + get :index end end end diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb index bf6b68df54e..d58f07a92a6 100644 --- a/spec/controllers/concerns/send_file_upload_spec.rb +++ b/spec/controllers/concerns/send_file_upload_spec.rb @@ -193,7 +193,7 @@ RSpec.describe SendFileUpload, feature_category: :user_profile do it 'sends a file with a custom type' do headers = double - expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fjavascript/ + expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=text%2Fjavascript/ expect(Gitlab::Workhorse).to receive(:send_url).with(expected_headers).and_call_original expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/) |