diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 52bf259feeacb9273a48d174da529e849d387f78..2c4d516205f6040ad359d62a0bf8f19c039495f9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -74,8 +74,7 @@
%header{:class=>('landing' unless current_user)}
= render 'layouts/header'
- - if @backbone
- = render 'templates/templates'
+ = render 'templates/templates'
.container{:style=> "#{yield(:break_the_mold)}"}
- if @aspsect == :getting_started || @page == :logged_out
diff --git a/app/views/templates/stream_element.ujs b/app/views/templates/stream_element.ujs
index 6b7ea2f6e502ad2b35e425ff70a4ece18717f54a..9b0c203db741f737b9b23d5ceffdd13912fca697 100644
--- a/app/views/templates/stream_element.ujs
+++ b/app/views/templates/stream_element.ujs
@@ -34,41 +34,41 @@
<time class="timeago" datetime="<%= created_at %>"/>
</a>
</span>
+ </div>
- <p>
- <%= text %>
- </p>
+ <p class="post-text">
+ <%= text %>
+ </p>
- <div class="info">
- <% if(provider_display_name != null) { %>
- <span class="via">
- via <%= provider_display_name %>
- -
- </span>
- <% } %>
- <span class="post_scope">
- <%= public === true ? "Public" : "Limited" %>
+ <div class="info">
+ <% if(provider_display_name != null) { %>
+ <span class="via">
+ via <%= provider_display_name %>
-
</span>
- <a href="#" class="focus_comment_textarea">
- Comment
- </a>
- </div>
+ <% } %>
+ <span class="post_scope">
+ <%= public === true ? "Public" : "Limited" %>
+ -
+ </span>
+ <a href="#" class="focus_comment_textarea">
+ Comment
+ </a>
+ </div>
- <div class="likes on_post">
- <div class="likes_container">
- <% if(likes_count > 0){ %>
- <img alt="Heart" src="/images/icons/heart.png?1322618579">
- <a href="/posts/<%= id %>/likes" class="expand_likes">
- <%= likes_count %> like
- </a>
- <span class="hidden likes_list"></span>
- <% } %>
- </div>
+ <div class="likes on_post">
+ <div class="likes_container">
+ <% if(likes_count > 0){ %>
+ <img alt="Heart" src="/images/icons/heart.png?1322618579">
+ <a href="/posts/<%= id %>/likes" class="expand_likes">
+ <%= likes_count %> like
+ </a>
+ <span class="hidden likes_list"></span>
+ <% } %>
</div>
+ </div>
- <div class="comments"> </div>
+ <div class="comments"> </div>
- </div>
</div>
</div>
diff --git a/public/javascripts/app/views/comment.js b/public/javascripts/app/views/comment_view.js
similarity index 100%
rename from public/javascripts/app/views/comment.js
rename to public/javascripts/app/views/comment_view.js
diff --git a/public/javascripts/app/views/comment-stream.js b/public/javascripts/app/views/commment_stream_view.js
similarity index 100%
rename from public/javascripts/app/views/comment-stream.js
rename to public/javascripts/app/views/commment_stream_view.js
diff --git a/public/javascripts/app/views/post.js b/public/javascripts/app/views/post_view.js
similarity index 100%
rename from public/javascripts/app/views/post.js
rename to public/javascripts/app/views/post_view.js
diff --git a/public/javascripts/app/views/stream.js b/public/javascripts/app/views/stream_view.js
similarity index 100%
rename from public/javascripts/app/views/stream.js
rename to public/javascripts/app/views/stream_view.js
diff --git a/spec/controllers/multis_controller_spec.rb b/spec/controllers/multis_controller_spec.rb
index 7afb5ea57c774e0060d3fb7d129c45702ea98279..8bbe9738b3b6b91b2163114733390e6cb3156493 100644
--- a/spec/controllers/multis_controller_spec.rb
+++ b/spec/controllers/multis_controller_spec.rb
@@ -17,7 +17,7 @@ describe MultisController do
describe 'jasmine fixtures' do
it 'generate' do
- status_message = alice.post(:status_message, :text => "hey", :to => alice.aspects.first.id)
+ status_message = alice.post(:status_message, :text => "hella infos yo!", :to => alice.aspects.first.id)
get :index, :format => :json
save_fixture(response.body, "multi_stream_json")
end
diff --git a/spec/jasmine_fixtures/template_spec.rb b/spec/jasmine_fixtures/template_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3be7d6b7056b381dbc2ba8a4de93af9133f1802e
--- /dev/null
+++ b/spec/jasmine_fixtures/template_spec.rb
@@ -0,0 +1,9 @@
+require "spec_helper"
+
+describe "template generation" do
+ it "generates templates" do
+ extend JasmineFixtureGeneration
+ templates = Haml::Engine.new(Rails.root.join("app", "views", "templates", "_templates.haml").read).render
+ save_fixture(templates, "underscore_templates")
+ end
+end
diff --git a/spec/javascripts/app/views/stream_view_spec.js b/spec/javascripts/app/views/stream_view_spec.js
index 23380f6798bbbdad42a698abee5c76c6c852515a..42b5304c8cf5c357f0f8065ede70389079f78010 100644
--- a/spec/javascripts/app/views/stream_view_spec.js
+++ b/spec/javascripts/app/views/stream_view_spec.js
@@ -2,14 +2,18 @@ describe("App.views.Stream", function(){
describe("#render", function(){
beforeEach(function(){
+ // should be jasmine helper
+ window.current_user = App.user({name: "alice", avatar : {small : "http://avatar.com"}});
+
//hella hax
- spec.loadFixture("multi_stream_json")
- var fixtureStream = $.parseJSON($("#jasmine_content").html())
+ spec.loadFixture("multi_stream_json");
+ var posts = $.parseJSON($("#jasmine_content").html())["posts"]
+ spec.loadFixture("underscore_templates");
- this.statusMessage = new App.Models.Post(fixtureStream["posts"][0] );
+ this.collection = new App.Collections.Stream(posts)
+ this.statusMessage = this.collection.models[0];
// this.picture = new App.Models.Post({post_type : "ActivityStreams::Photo", image_url : "http://amazonks.com/pretty_picture_lol.gif"});
- this.collection = new App.Collections.Stream([this.statusMessage]);
this.view = new App.Views.Stream({collection : this.collection});
this.view.render();
this.statusElement = $(this.view.$("#" + this.statusMessage.get("guid")));
@@ -18,8 +22,7 @@ describe("App.views.Stream", function(){
context("when rendering a Status Mesasage", function(){
it("shows the status message in the content area", function(){
- // we need to load the underscore templates here, otherwise our views won't render!
- expect(this.statusElement.find(".post-content p")).toBe("hella infos yo!")
+ expect($.trim(this.statusElement.find(".content p.post-text").text())).toBe("hella infos yo!")
})
})
diff --git a/spec/support/fixture_generation.rb b/spec/support/fixture_generation.rb
index d0961589e6a228b88c78032de1d2c488c5c75943..3d8293f00c469627b213a0d6f13436a77dc07f0f 100644
--- a/spec/support/fixture_generation.rb
+++ b/spec/support/fixture_generation.rb
@@ -1,5 +1,4 @@
-RSpec::Rails::ControllerExampleGroup.class_eval do
-
+module JasmineFixtureGeneration
# Saves the markup to a fixture file using the given name
def save_fixture(markup, name, fixture_path=nil )
fixture_path = File.join(Rails.root, 'tmp', 'js_dom_fixtures') unless fixture_path
@@ -41,3 +40,7 @@ RSpec::Rails::ControllerExampleGroup.class_eval do
end
end
+RSpec::Rails::ControllerExampleGroup.class_eval do
+ include JasmineFixtureGeneration
+end
+