Use nested resources.

Instead of new "All Links" link, just use the label.

Get these tests passing once again now that we're using nested resource routes.

Author: openbrian

app/controllers/microcosm_links_controller.rb

@@ -8,15 +8,14 @@ class MicrocosmLinksController < ApplicationController
   authorize_resource
 
   def index
-    return "missing parameter microcosm_id" unless params.key?(:microcosm_id)
-
-    @microcosm_id = params[:microcosm_id]
-    @links = MicrocosmLink.where(:microcosm_id => @microcosm_id)
+    @microcosm = Microcosm.friendly.find(params[:microcosm_id])
+    @links = @microcosm.microcosm_links
   end
 
   def new
     return "missing parameter microcosm_id" unless params.key?(:microcosm_id)
 
+    @microcosm = Microcosm.friendly.find(params[:microcosm_id])
     @title = t ".title"
     @link = MicrocosmLink.new
     @link.microcosm_id = params[:microcosm_id]
@@ -25,7 +24,8 @@ def new
   def edit; end
 
   def create
-    @link = MicrocosmLink.new(link_params)
+    @microcosm = Microcosm.friendly.find(params[:microcosm_id])
+    @link = @microcosm.microcosm_links.build(link_params)
     if @link.save
       response.set_header("link_id", @link.id) # for testing
       redirect_to @link.microcosm, :notice => t(".success")

app/views/microcosm_links/_form.html.erb

@@ -1,5 +1,4 @@
-<%= bootstrap_form_for @link do |form| %>
-  <%= form.hidden_field :microcosm_id, :value => @link.microcosm_id %>
+<%= bootstrap_form_for [@microcosm, @link] do |form| %>
   <%= form.text_field :site %>
   <%= form.text_field :url %>
   <%= form.primary %>

app/views/microcosm_links/index.html.erb

@@ -1,8 +1,10 @@
 <% content_for :heading do %>
   <h1><%= t(".title") %></h1>
-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), new_microcosm_link_path(:params => { :microcosm_id => @microcosm_id }) %></li>
-  </ul>
+  <nav class="secondary-actions">
+    <ul class='clearfix'>
+      <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), new_microcosm_microcosm_link_path(@microcosm) %></li>
+    </ul>
+  </nav>
 <% end %>
 
 <% if !@links.empty? %>

app/views/microcosms/show.html.erb

@@ -30,19 +30,20 @@
         <%= auto_link @microcosm.description %>
       </p>
       <div class="d-flex">
-        <label><%= t(".links") %></label>
+        <label>
+          <% if current_user == @microcosm.organizer %>
+              <%= link_to t(".links"), microcosm_microcosm_links_path(@microcosm) %>
+            <% else %>
+              <%= t(".links") %>
+          <% end %>
+        </label>
         <ul class="ps-2 breadcrumb">
           <% @microcosm.microcosm_links.each do |link| %>
             <li class="breadcrumb-item">
               <a href="<%= link.url %>"><%= link.site %></a>
             </li>
           <% end %>
         </ul>
-        <% if current_user %>
-          <% if current_user == @microcosm.organizer %>
-            <%= link_to t(".all_links"), microcosm_links_path(:params => { :microcosm_id => @microcosm.id }) %>
-          <% end %>
-        <% end %>
       </div>
       <div>
         <label><%= t(".organizer") %></label>

config/locales/en.yml

@@ -1580,7 +1580,6 @@ en:
     new:
       title: "New Microcosm"
     show:
-      all_links: "All Links"
       edit: "Edit"
       header_title: "Microcosm"
       links: "Links"

config/routes.rb

@@ -327,8 +327,10 @@
   end
 
   # microcosms
-  resources :microcosms
-  resources :microcosm_links, :except => [:show]
+  resources :microcosms do
+    resources :microcosm_links, :only => [:create, :index, :new]
+  end
+  resources :microcosm_links, :only => [:destroy, :edit, :update]
 
   # errors
   match "/403", :to => "errors#forbidden", :via => :all

test/controllers/microcosm_links_controller_test.rb

@@ -9,8 +9,8 @@ class MicrocosmLinksControllerTest < ActionDispatch::IntegrationTest
 
   def test_routes
     assert_routing(
-      { :path => "/microcosm_links", :method => :get },
-      { :controller => "microcosm_links", :action => "index" }
+      { :path => "/microcosms/foo/microcosm_links", :method => :get },
+      { :controller => "microcosm_links", :action => "index", :microcosm_id => "foo" }
     )
     assert_routing(
       { :path => "/microcosm_links/1/edit", :method => :get },
@@ -21,12 +21,12 @@ def test_routes
       { :controller => "microcosm_links", :action => "update", :id => "1" }
     )
     assert_routing(
-      { :path => "/microcosm_links/new", :method => :get },
-      { :controller => "microcosm_links", :action => "new" }
+      { :path => "/microcosms/foo/microcosm_links/new", :method => :get },
+      { :controller => "microcosm_links", :action => "new", :microcosm_id => "foo" }
     )
     assert_routing(
-      { :path => "/microcosm_links", :method => :post },
-      { :controller => "microcosm_links", :action => "create" }
+      { :path => "/microcosms/foo/microcosm_links", :method => :post },
+      { :controller => "microcosm_links", :action => "create", :microcosm_id => "foo" }
     )
   end
 
@@ -35,7 +35,7 @@ def test_index_get
     m = create(:microcosm)
     link = create(:microcosm_link, :microcosm_id => m.id)
     # act
-    get microcosm_links_path(:params => { :microcosm_id => m.id })
+    get microcosm_microcosm_links_path(m.id)
     # assert
     assert_response :success
     assert_template "index"
@@ -58,7 +58,7 @@ def test_update_as_non_organizer
     link = create(:microcosm_link)
     session_for(create(:user))
     # act
-    put microcosm_link_path(link), :params => { :microcosm_link => link.as_json }, :xhr => true
+    put microcosm_link_path link, :microcosm_link => link
     # assert
     assert_redirected_to :controller => :errors, :action => :forbidden
   end
@@ -120,11 +120,13 @@ def controller_mock.render(_partial)
   def test_new_no_login
     # Make sure that you are redirected to the login page when you
     # are not logged in
+    # arrange
+    m = create(:microcosm)
     # act
-    get new_microcosm_link_path
+    get new_microcosm_microcosm_link_path(m)
     # assert
     assert_response :redirect
-    assert_redirected_to login_path(:referer => new_microcosm_link_path)
+    assert_redirected_to login_path(:referer => new_microcosm_microcosm_link_path(m))
   end
 
   def test_new_form
@@ -133,35 +135,39 @@ def test_new_form
     m = create(:microcosm)
     session_for(m.organizer)
     # act
-    get new_microcosm_link_path(:params => { :microcosm_id => m.id })
+    get new_microcosm_microcosm_link_path(m)
     # assert
     assert_response :success
     assert_select "div.content-heading", :count => 1 do
       assert_select "h1", :text => /Microcosm Link/, :count => 1
     end
+    action = microcosm_microcosm_links_path(m)
     assert_select "div#content", :count => 1 do
-      assert_select "form[action='/microcosm_links'][method=post]", :count => 1 do
+      assert_select "form[action='#{action}'][method=post]", :count => 1 do
         assert_select "input#microcosm_link_site[name='microcosm_link[site]']", :count => 1
         assert_select "input#microcosm_link_url[name='microcosm_link[url]']", :count => 1
-        assert_select "input", :count => 5
+        assert_select "input", :count => 4
       end
     end
   end
 
   def test_create_when_save_works
     # arrange
     m = create(:microcosm)
-    link_orig = create(:microcosm_link, :microcosm_id => m.id)
+    link_orig = create(:microcosm_link, :microcosm => m)
+    form = link_orig.attributes.except("id", "created_at", "updated_at")
     session_for(m.organizer)
 
     # act
     link_new_id = nil
     assert_difference "MicrocosmLink.count", 1 do
-      post microcosm_links_url, :params => { :microcosm_link => link_orig.as_json }, :xhr => true
+      post microcosm_microcosm_links_path m.id, :microcosm_link => form
       link_new_id = @response.headers["link_id"]
     end
 
     # assert
+    # Not sure what's going on with this assigns magic.
+    # assert_redirected_to "/microcosm/#{assigns(:microcosm_link).id}"
     assert_equal I18n.t("microcosm_links.create.success"), flash[:notice]
     link_new = MicrocosmLink.find_by(:id => link_new_id)
     # Assign the id m_new to m_orig, so we can do an equality test easily.
@@ -171,29 +177,17 @@ def test_create_when_save_works
 
   def test_create_when_save_fails
     # arrange
-    session_for(create(:user))
-    link = create(:microcosm_link)
-    link = link.attributes.except("id", "created_at", "updated_at", "slug")
-
-    mock_microcosm_link = Minitest::Mock.new
-    mock_microcosm_link.expect :save, false
-
-    # We're going to stub render on this instance.
-    controller_prime = MicrocosmLinksController.new
+    mic = create(:microcosm)
+    session_for(mic.organizer)
+    link = build(:microcosm_link, :microcosm => mic, :url => "invalid url")
+    form = link.attributes.except("id", "created_at", "updated_at")
 
     # act and assert
-    MicrocosmLinksController.stub :new, controller_prime do
-      controller_prime.stub :render, "" do
-        MicrocosmLink.stub :new, mock_microcosm_link do
-          assert_difference "MicrocosmLink.count", 0 do
-            post microcosm_links_path, :params => { :microcosm_link => link.as_json }, :xhr => true
-          end
-        end
-      end
+    assert_no_difference "MicrocosmLink.count", 0 do
+      post microcosm_microcosm_links_path :microcosm_link => form, :microcosm_id => mic.id
     end
 
-    # assert_mock mock_microcosm
-    # assert_mock render_mock
+    assert_template :new
   end
 
   def test_delete