Commit 4bcbc770 authored by Michael Kozono's avatar Michael Kozono

Fix spec and Rubocop failures

parent df206331
...@@ -23,7 +23,7 @@ module EE ...@@ -23,7 +23,7 @@ module EE
email_opted_in: model.email_opted_in, email_opted_in: model.email_opted_in,
email_opted_in_ip: model.email_opted_in_ip, email_opted_in_ip: model.email_opted_in_ip,
email_opted_in_source: model.email_opted_in_source, email_opted_in_source: model.email_opted_in_source,
email_opted_in_at: model.email_opted_in_at, email_opted_in_at: model.email_opted_in_at
} }
end end
end end
......
module EE module EE
module Users module Users
module BuildService module BuildService
private private
def signup_params def signup_params
......
...@@ -10,8 +10,8 @@ describe SystemHooksService do ...@@ -10,8 +10,8 @@ describe SystemHooksService do
let(:group_member) { create(:group_member) } let(:group_member) { create(:group_member) }
context 'event data' do context 'event data' do
it { expect(event_data(user, :create)).to include(:event_name, :name, :created_at, :updated_at, :email, :user_id, :username, :email_opted_in) } it { expect(event_data(user, :create)).to include(:event_name, :name, :created_at, :updated_at, :email, :user_id, :username) }
it { expect(event_data(user, :destroy)).to include(:event_name, :name, :created_at, :updated_at, :email, :user_id, :username, :email_opted_in) } it { expect(event_data(user, :destroy)).to include(:event_name, :name, :created_at, :updated_at, :email, :user_id, :username) }
it { expect(event_data(project, :create)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) } it { expect(event_data(project, :create)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
it { expect(event_data(project, :update)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) } it { expect(event_data(project, :update)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
it { expect(event_data(project, :destroy)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) } it { expect(event_data(project, :destroy)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
......
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