From 9d24b518f5383e025f59b596d8bb96fa4960525d Mon Sep 17 00:00:00 2001
From: Dennis Collinson <dennis.collective@gmail.com>
Date: Tue, 3 Jan 2012 14:09:57 -0800
Subject: [PATCH] DC DG; correctly populate the stream jasmine fixture
---
Gemfile | 2 ++
Gemfile.lock | 2 ++
.../jasmine_fixtures/stream_spec.rb | 23 +++++++++++--------
.../app/views/feedback_view_spec.js | 2 +-
spec/javascripts/app/views/likes_info_spec.js | 2 +-
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/Gemfile b/Gemfile
index b143865a4f..45000d8fbf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -129,6 +129,8 @@ group :test do
gem 'cucumber-api-steps', '0.6', :require => false
gem 'database_cleaner', '0.7.0'
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
+
+ gem 'timecop'
#"0.1.0", #:path => '~/workspace/diaspora-client'
gem 'factory_girl_rails'
gem 'fixture_builder', '0.3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 98cf90f564..57084b935f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -417,6 +417,7 @@ GEM
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
+ timecop (0.3.5)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
@@ -530,6 +531,7 @@ DEPENDENCIES
sod!
sqlite3
thin (~> 1.3.1)
+ timecop
twitter (= 2.0.2)
typhoeus
vanna!
diff --git a/spec/controllers/jasmine_fixtures/stream_spec.rb b/spec/controllers/jasmine_fixtures/stream_spec.rb
index e27830635b..27f71b9c6b 100644
--- a/spec/controllers/jasmine_fixtures/stream_spec.rb
+++ b/spec/controllers/jasmine_fixtures/stream_spec.rb
@@ -13,22 +13,25 @@ describe MultisController do
it 'generates the multi_stream_json fixture', :fixture => true do
posts = []
- 10.times do
- posts << alice.post(:status_message, :text => "hella infos yo!", :to => alice.aspects.first.id)
- posts << alice.post(:reshare, :root_guid => Factory(:status_message, :public => true).guid, :to => 'all')
- posts << alice.post(:status_message, :text => "you're gonna love this.'", :to => alice.aspects.first.id)
- alice.like(1, :target => posts.last)
- end
-
time = Time.now
- posts.each do |p|
- time += 1.day
- p.stub(:created_at).and_return(time)
+ 10.times do
+ Timecop.travel time += 1.day do
+ Timecop.travel time += 1.minute
+ posts << alice.post(:status_message, :text => "hella infos yo!", :to => alice.aspects.first.id)
+ Timecop.travel time += 1.minute
+ posts << alice.post(:reshare, :root_guid => Factory(:status_message, :public => true).guid, :to => 'all')
+ Timecop.travel time += 1.minute
+ posts << alice.post(:status_message, :text => "you're gonna love this.'", :to => alice.aspects.first.id)
+ Timecop.travel time += 1.minute
+ alice.like(1, :target => posts.last)
+ end
end
get :index, :format => :json
response.should be_success
save_fixture(response.body, "multi_stream_json")
+
+ Timecop.return
end
end
end
diff --git a/spec/javascripts/app/views/feedback_view_spec.js b/spec/javascripts/app/views/feedback_view_spec.js
index 9d70722e8d..58ad9b460f 100644
--- a/spec/javascripts/app/views/feedback_view_spec.js
+++ b/spec/javascripts/app/views/feedback_view_spec.js
@@ -4,7 +4,7 @@ describe("app.views.Feedback", function(){
var posts = $.parseJSON(spec.readFixture("multi_stream_json"))["posts"];
- this.post = new app.models.Post(posts[2]);
+ this.post = new app.models.Post(posts[0]);
this.view = new app.views.Feedback({model: this.post});
});
diff --git a/spec/javascripts/app/views/likes_info_spec.js b/spec/javascripts/app/views/likes_info_spec.js
index d58183b1b1..44428aef4f 100644
--- a/spec/javascripts/app/views/likes_info_spec.js
+++ b/spec/javascripts/app/views/likes_info_spec.js
@@ -3,7 +3,7 @@ describe("app.views.LikesInfo", function(){
window.current_user = app.user({id : -1, name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}});
var posts = $.parseJSON(spec.readFixture("multi_stream_json"))["posts"];
- this.post = new app.models.Post(posts[2]); // post with a like
+ this.post = new app.models.Post(posts[0]); // post with a like
this.view = new app.views.LikesInfo({model: this.post});
});
--
GitLab