summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-03-13 19:42:11 +0000
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-03-13 19:42:11 +0000
commitfabc9d15448af10061314b55388bdfb4ba766e42 (patch)
treea7df6549768966e711b36f265b40587e1a48838b
parent9cdb7621fa98ed68c8b0f3ac9f3209d16f7f1743 (diff)
downloadgitlab-ce-osw-test-wrong-discussion-diff.tar.gz
Update spec/models/event_spec.rbosw-test-wrong-discussion-diff
-rw-r--r--spec/models/event_spec.rb23
1 files changed, 6 insertions, 17 deletions
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index ce4f8ee4705..e1041da679a 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -13,8 +13,10 @@ describe Event do
it { is_expected.to respond_to(:merge_request_title) }
end
+
+
describe 'Callbacks' do
- let(:project) { create(:project) }
+ let(:project) { create(:prject) }
describe 'after_create :reset_project_activity' do
it 'calls the reset_project_activity method' do
@@ -25,7 +27,7 @@ describe Event do
end
describe 'after_create :set_last_repository_updated_at' do
- context 'with a push event' do
+ context 'with a pu event' do
it 'updates the project last_repository_updated_at' do
project.update(last_repository_updated_at: 1.year.ago)
@@ -50,6 +52,8 @@ describe Event do
end
end
+
+
describe '#set_last_repository_updated_at' do
it 'only updates once every Event::REPOSITORY_UPDATED_AT_INTERVAL minutes' do
last_known_timestamp = (Event::REPOSITORY_UPDATED_AT_INTERVAL - 1.minute).ago
@@ -80,21 +84,6 @@ describe Event do
end
end
- describe "Push event" do
- let(:project) { create(:project, :private) }
- let(:user) { project.owner }
- let(:event) { create_push_event(project, user) }
-
- it do
- expect(event.push?).to be_truthy
- expect(event.visible_to_user?(user)).to be_truthy
- expect(event.visible_to_user?(nil)).to be_falsey
- expect(event.tag?).to be_falsey
- expect(event.branch_name).to eq("master")
- expect(event.author).to eq(user)
- end
- end
-
describe '#membership_changed?' do
context "created" do
subject { build(:event, :created).membership_changed? }