From d7ed3b4766871c30f50736c1d9eedc46c4035841 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 1 Jun 2020 18:08:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/action_cable_logging_spec.rb | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 spec/features/action_cable_logging_spec.rb (limited to 'spec/features') diff --git a/spec/features/action_cable_logging_spec.rb b/spec/features/action_cable_logging_spec.rb new file mode 100644 index 00000000000..f0bdb5fdd8c --- /dev/null +++ b/spec/features/action_cable_logging_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'ActionCable logging', :js do + let_it_be(:project) { create(:project, :public) } + let_it_be(:issue) { create(:issue, project: project) } + let_it_be(:user) { create(:user) } + + before_all do + project.add_developer(user) + end + + it 'adds extra context to logs' do + allow(ActiveSupport::Notifications).to receive(:instrument).and_call_original + + expect(ActiveSupport::Notifications).to receive(:instrument).with( + 'connect.action_cable', + a_hash_including(remote_ip: '127.0.0.1', user_id: nil, username: nil) + ) + + subscription_data = a_hash_including( + remote_ip: '127.0.0.1', + user_id: user.id, + username: user.username, + params: a_hash_including( + project_path: project.full_path, + iid: issue.iid.to_s + ) + ) + + expect(ActiveSupport::Notifications).to receive(:instrument).with('subscribe.action_cable', subscription_data) + + gitlab_sign_in(user) + visit project_issue_path(project, issue) + end +end -- cgit v1.2.1