From f0f388d9e168719cf86d75818c2c25a2fcea8dab Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Fri, 5 Aug 2011 14:45:40 -0700
Subject: [PATCH] Fix weird error in jasmine suite

---
 spec/controllers/aspects_controller_spec.rb         | 4 +---
 spec/controllers/status_messages_controller_spec.rb | 7 +++++++
 spec/javascripts/content-updater-spec.js            | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index 25fa6e007..6de8a360c 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -68,8 +68,6 @@ describe AspectsController do
       3.times { bob.comment("what", :post => message) }
       get :index
       save_fixture(html_for("body"), "aspects_index_with_posts")
-
-      save_fixture(html_for(".stream_element:first"), "status_message_in_stream")
     end
 
     context 'with getting_started = true' do
@@ -77,7 +75,7 @@ describe AspectsController do
         alice.getting_started = true
         alice.save
       end
-      
+
       it 'does not redirect mobile users to getting_started' do
         get :index, :format => :mobile
         response.should_not be_redirect
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index b648ab187..4adfb8d83 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -61,6 +61,13 @@ describe StatusMessagesController do
         json['html'].should_not be_nil
       end
 
+      it 'saves the html as a fixture', :fixture => true do
+        post :create, status_message_hash.merge(:format => 'js')
+        json = JSON.parse(response.body)
+        save_fixture(json['html'], "created_status_message")
+
+      end
+
       it 'escapes XSS' do
         xss = "<script> alert('hi browser') </script>"
         post :create, status_message_hash.merge(:format => 'js', :text => xss)
diff --git a/spec/javascripts/content-updater-spec.js b/spec/javascripts/content-updater-spec.js
index df0bc5ae0..6baf2bc6c 100644
--- a/spec/javascripts/content-updater-spec.js
+++ b/spec/javascripts/content-updater-spec.js
@@ -13,21 +13,21 @@ describe("ContentUpdater", function() {
 
     it("adds a post to the stream", function() {
       var originalPostCount = $(".stream_element").length;
-      ContentUpdater.addPostToStream(spec.fixtureHtml("status_message_in_stream"));
+      ContentUpdater.addPostToStream(spec.fixtureHtml("created_status_message"));
       expect($(".stream_element").length).toEqual(originalPostCount + 1);
     });
 
     it("does not add duplicate posts", function() {
       var originalPostCount = $(".stream_element").length;
-      ContentUpdater.addPostToStream(spec.fixtureHtml("status_message_in_stream"));
+      ContentUpdater.addPostToStream(spec.fixtureHtml("created_status_message"));
       expect($(".stream_element").length).toEqual(originalPostCount + 1);
-      ContentUpdater.addPostToStream(spec.fixtureHtml("status_message_in_stream"));
+      ContentUpdater.addPostToStream(spec.fixtureHtml("created_status_message"));
       expect($(".stream_element").length).toEqual(originalPostCount + 1);
     });
 
     it("removes the div that says you have no posts if it exists", function() {
       expect($("#no_posts").length).toEqual(1);
-      ContentUpdater.addPostToStream(spec.fixtureHtml("status_message_in_stream"));
+      ContentUpdater.addPostToStream(spec.fixtureHtml("created_status_message"));
       expect($("#no_posts").length).toEqual(0);
     });
   });