Displaying topics list on home page.

futurechimp · Jun 9, 2011 · 6455804 · 6455804
1 parent 513308c
commit 6455804
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/app/controllers/home.rb b/app/controllers/home.rb
@@ -20,6 +20,7 @@
 
   get :index, :map => "/" do
     @feed_items = FeedItem.order_by([:date_published, :desc]).limit(60)
+    @wires = Wire.all
     erb :"home/index"
   end
 

diff --git a/app/views/home/index.erb b/app/views/home/index.erb
@@ -21,14 +21,14 @@
   <li id="just-head"><a href="#">Just Head</a></li>  
  </ul>
  <div id="topics" class="list">
+<% unless @wires.empty? %>
   <h2>Topics</h2>
   <ul>
-    <li><a href="#">Blah</a></li>
-    <li><a href="#">Foo</a></li>
-    <li><a href="#" class="on">Bar</a></li>
-    <li><a href="#">More Blah</a></li>
-    <li><a href="#">Potato</a></li>
+      <% @wires.each do |wire| %>
+        <li><%= wire.name %></li>
+      <% end %>
   </ul>
+<% end %>
  </div>
  <div id="tags">
   <h2>Bar:Tags</h2>

diff --git a/test/app/controllers/home_controller_test.rb b/test/app/controllers/home_controller_test.rb
@@ -5,6 +5,7 @@ class HomeControllerTest < Test::Unit::TestCase
 
     setup do
       FeedItem.destroy_all
+      Wire.destroy_all
     end    
 
     context "with no FeedItems" do
@@ -40,7 +41,28 @@ class HomeControllerTest < Test::Unit::TestCase
           assert_match(/#{feed_item.title}/, last_response.body)
         end
       end
+    end
+
+    context "with Wires" do
+      setup do
+        @wire = Wire.make
+        @wire.save
+        get '/'
+      end
+
+      should "output the @wire#name" do
+        assert_match(/#{@wire.name}/, last_response.body)
+      end
+    end  
+
+    context "with no Wires" do
+      setup do
+        get '/'
+      end
 
+      should "not output the Topics list" do
+        assert_no_match(/<h2>Topics<\/h2>/, last_response.body)
+      end
     end    
   end
 end