From 8773f339a33cf31f979013cf306e5fca5fe66a89 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 2 May 2015 23:14:31 -0400
Subject: Minor model spec cleanups

Snippet model was missing project association
---
 spec/models/merge_request_spec.rb | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'spec/models/merge_request_spec.rb')

diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 757d8bdfae2..57b1b9dfcf0 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -26,6 +26,13 @@ require 'spec_helper'
 describe MergeRequest do
   subject { create(:merge_request) }
 
+  describe 'associations' do
+    it { is_expected.to belong_to(:target_project).with_foreign_key(:target_project_id).class_name('Project') }
+    it { is_expected.to belong_to(:source_project).with_foreign_key(:source_project_id).class_name('Project') }
+
+    it { is_expected.to have_one(:merge_request_diff).dependent(:destroy) }
+  end
+
   describe 'modules' do
     subject { described_class }
 
@@ -36,22 +43,12 @@ describe MergeRequest do
     it { is_expected.to include_module(Taskable) }
   end
 
-  describe 'associations' do
-    it { is_expected.to belong_to(:target_project).with_foreign_key(:target_project_id).class_name('Project') }
-    it { is_expected.to belong_to(:source_project).with_foreign_key(:source_project_id).class_name('Project') }
-
-    it { is_expected.to have_one(:merge_request_diff).dependent(:destroy) }
-  end
-
   describe 'validation' do
     it { is_expected.to validate_presence_of(:target_branch) }
     it { is_expected.to validate_presence_of(:source_branch) }
   end
 
-  describe "Mass assignment" do
-  end
-
-  describe "Respond to" do
+  describe 'respond to' do
     it { is_expected.to respond_to(:unchecked?) }
     it { is_expected.to respond_to(:can_be_merged?) }
     it { is_expected.to respond_to(:cannot_be_merged?) }
@@ -83,8 +80,6 @@ describe MergeRequest do
     end
   end
 
-  subject { create(:merge_request) }
-
   describe '#is_being_reassigned?' do
     it 'returns true if the merge_request assignee has changed' do
       subject.assignee = create(:user)
-- 
cgit v1.2.3