Fixing broken test of project last_activity

randx
1 parent e0c43c46
Showing 1 changed file with 16 additions and 16 deletions Show diff stats
spec/models/project_spec.rb
@@ -167,29 +167,29 @@ describe Project do
     end
   end
  
-  describe "last_activity" do
+  describe "last_activity methods" do
     let(:project)    { Factory :project }
+    let(:last_event) { double(created_at: Time.now) }
  
-    before do
-      project.stub(last_event: double)
+    describe "last_activity" do
+      it "should alias last_activity to last_event"do
+        project.stub(last_event: last_event)
+        project.last_activity.should == last_event
+      end
     end
  
-    it { project.last_activity.should == last_event }
-  end
-
-  describe 'last_activity_date' do
-    let(:project)    { Factory :project }
-
-    it 'returns the creation date of the project\'s last event if present' do
-      last_event = double(created_at: Time.now)
-      project.stub(last_event: last_event)
-      project.last_activity_date.should == last_event.created_at
-    end
+    describe 'last_activity_date' do
+      it 'returns the creation date of the project\'s last event if present' do
+        project.stub(last_event: last_event)
+        project.last_activity_date.should == last_event.created_at
+      end
  
-    it 'returns the project\'s last update date if it has no events' do
-      project.last_activity_date.should == project.updated_at
+      it 'returns the project\'s last update date if it has no events' do
+        project.last_activity_date.should == project.updated_at
+      end
     end
   end
+
   describe "fresh commits" do
     let(:project) { Factory :project }
...	...	@@ -167,29 +167,29 @@ describe Project do
167	167	end
168	168	end
169	169
170		- describe "last_activity" do
	170	+ describe "last_activity methods" do
171	171	let(:project) { Factory :project }
	172	+ let(:last_event) { double(created_at: Time.now) }
172	173
173		- before do
174		- project.stub(last_event: double)
	174	+ describe "last_activity" do
	175	+ it "should alias last_activity to last_event"do
	176	+ project.stub(last_event: last_event)
	177	+ project.last_activity.should == last_event
	178	+ end
175	179	end
176	180
177		- it { project.last_activity.should == last_event }
178		- end
179		-
180		- describe 'last_activity_date' do
181		- let(:project) { Factory :project }
182		-
183		- it 'returns the creation date of the project\'s last event if present' do
184		- last_event = double(created_at: Time.now)
185		- project.stub(last_event: last_event)
186		- project.last_activity_date.should == last_event.created_at
187		- end
	181	+ describe 'last_activity_date' do
	182	+ it 'returns the creation date of the project\'s last event if present' do
	183	+ project.stub(last_event: last_event)
	184	+ project.last_activity_date.should == last_event.created_at
	185	+ end
188	186
189		- it 'returns the project\'s last update date if it has no events' do
190		- project.last_activity_date.should == project.updated_at
	187	+ it 'returns the project\'s last update date if it has no events' do
	188	+ project.last_activity_date.should == project.updated_at
	189	+ end
191	190	end
192	191	end
	192	+
193	193	describe "fresh commits" do
194	194	let(:project) { Factory :project }
195	195
...	...