Take extraneous data out of welcome test, remove 'main' key

MikeSofaer · Oct 22, 2010 · 65c3f42 · 65c3f42
1 parent 8a23d04
commit 65c3f42
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/test/app/controllers/personas_controller.rb b/test/app/controllers/personas_controller.rb
@@ -1,11 +1,11 @@
 class PersonasController < ApplicationController
   def index
-    {:main => {"personas" => Persona.all}}
+    {:personas => Persona.all}
   end
   def show(opts = params)
     persona = Persona.named(opts["persona"]).first
-    sidebar = friend_catchphrases("personas" => persona["partners"])
-    {:main => {:persona =>persona, :sidebar => sidebar}}
+    friend_catchphrases = friend_catchphrases("personas" => persona["partners"])
+    {:persona =>persona, :friend_catchphrases => friend_catchphrases}
   end
   def friend_catchphrases(opts=params)
     names = opts["personas"]

diff --git a/test/app/views/personas/index.html.erb b/test/app/views/personas/index.html.erb
@@ -1,5 +1,5 @@
 <div id=main style="width:70%;float:left;border:black 5px solid;">
-  <% main["personas"].each do |persona| %>
+  <% personas.each do |persona| %>
     <ul>
       <li><%=persona[:name]%></li>
       <li><%=persona[:catchphrase]%></li>

diff --git a/test/app/views/personas/show.html.erb b/test/app/views/personas/show.html.erb
@@ -1,12 +1,11 @@
 <div id=main style="width:70%;float:left;border:black 5px solid;">
-  <% persona = main[:persona] %>
   <ul>
     <li><%=persona[:name]%></li>
     <li><%=persona[:catchphrase]%></li>
   </ul>
 </div>
 <div id=sidebar style="width:20%;float:right;border:black 5px solid;">
-  <% main[:sidebar].each do |catchphrase| %>
+  <% friend_catchphrases.each do |catchphrase| %>
     <%=catchphrase%> <br/>
   <% end %>
 </div>

diff --git a/test/basic_test.rb b/test/basic_test.rb
@@ -19,13 +19,13 @@ def test_html_renders_template
     assert{ last_response.body =~  /Here is some text: hello/ }
   end
   def test_html_redirects_on_post
-    post "/welcome/create", "candy"
+    post "/welcome/create"
     assert { last_response.status == 302 }
     assert { last_response.location == "/link_to_candy"}
   end
   def test_json_renders_on_post
     header "Accept", 'application/json'
-    post "/welcome/create", "candy"
+    post "/welcome/create"
     assert { last_response.status == 201 }
     assert { JSON(last_response.body) == {"url" => "/link_to_candy"}}
   end

diff --git a/test/personas_test.rb b/test/personas_test.rb
@@ -23,18 +23,18 @@ def setup
   def test_index_has_layout
     header "Accept", 'application/json'
     get "/personas"
-	assert{ JSON(last_response.body).keys.sort == ["nav", "main", "footer"].sort }
+	assert{ JSON(last_response.body).keys.sort == ["nav", "personas", "footer"].sort }
   end
 
   def test_index_lists_personas
     header "Accept", 'application/json'
     get "/personas"
-    assert{ JSON(last_response.body)["main"]["personas"] == [@luis, @giorgi, @miranda]}
+    assert{ JSON(last_response.body)["personas"] == [@luis, @giorgi, @miranda]}
   end
   def test_show_lists_partner_catchphrases
     header "Accept", 'application/json'
     get "/personas/show?persona=The%20Fire%20Eater"
-    assert{ JSON(last_response.body)["main"]["sidebar"] == ["You're gonna get punted!"] }
+    assert{ JSON(last_response.body)["friend_catchphrases"] == ["You're gonna get punted!"] }
   end
   def test_friend_catchphrases_json_works
     header "Accept", 'application/json'