diff options
author | Andreas Brandl <abrandl@gitlab.com> | 2018-03-03 20:00:05 +0100 |
---|---|---|
committer | Andreas Brandl <abrandl@gitlab.com> | 2018-03-06 12:53:14 +0100 |
commit | 11a559f7c9ce21b040c3a9c0544169f4885b9fa6 (patch) | |
tree | 8da4be4133d05b0f8cd21f5f6de94423818a626f | |
parent | 8a7cd25d08789ee70eaa7de3367f7ad286c49272 (diff) | |
download | gitlab-ce-11a559f7c9ce21b040c3a9c0544169f4885b9fa6.tar.gz |
Singularize model name.
-rw-r--r-- | app/models/event.rb | 2 | ||||
-rw-r--r-- | app/models/user_interacted_project.rb (renamed from app/models/user_interacted_projects.rb) | 2 | ||||
-rw-r--r-- | spec/models/event_spec.rb | 12 | ||||
-rw-r--r-- | spec/models/user_interacted_project_spec.rb (renamed from spec/models/user_interacted_projects_spec.rb) | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 166c3f1b4b1..86a14044bc2 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -395,6 +395,6 @@ class Event < ActiveRecord::Base # Note the call to .available? is due to earlier migrations # that would otherwise conflict with the call to .track # (because the table does not exist yet). - UserInteractedProjects.track(self) if UserInteractedProjects.available? + UserInteractedProject.track(self) if UserInteractedProject.available? end end diff --git a/app/models/user_interacted_projects.rb b/app/models/user_interacted_project.rb index ba6ed2bd2ff..5e7f6d5eeda 100644 --- a/app/models/user_interacted_projects.rb +++ b/app/models/user_interacted_project.rb @@ -1,4 +1,4 @@ -class UserInteractedProjects < ActiveRecord::Base +class UserInteractedProject < ActiveRecord::Base belongs_to :user belongs_to :project diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 780eacbb8dc..8ea92410022 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -53,15 +53,15 @@ describe Event do describe 'after_create :track_user_interacted_projects' do let(:event) { build(:push_event, project: project, author: project.owner) } - it 'passes event to UserInteractedProjects.track' do - expect(UserInteractedProjects).to receive(:available?).and_return(true) - expect(UserInteractedProjects).to receive(:track).with(event) + it 'passes event to UserInteractedProject.track' do + expect(UserInteractedProject).to receive(:available?).and_return(true) + expect(UserInteractedProject).to receive(:track).with(event) event.save end - it 'does not call UserInteractedProjects.track if its not yet available' do - expect(UserInteractedProjects).to receive(:available?).and_return(false) - expect(UserInteractedProjects).not_to receive(:track) + it 'does not call UserInteractedProject.track if its not yet available' do + expect(UserInteractedProject).to receive(:available?).and_return(false) + expect(UserInteractedProject).not_to receive(:track) event.save end end diff --git a/spec/models/user_interacted_projects_spec.rb b/spec/models/user_interacted_project_spec.rb index 503d89e7f86..1428fc2d433 100644 --- a/spec/models/user_interacted_projects_spec.rb +++ b/spec/models/user_interacted_project_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe UserInteractedProjects do +describe UserInteractedProject do describe '.track' do subject { described_class.track(event) } let(:event) { build(:event) } |