Refs #26: Add paper destroy

hpi-swt2-exercise · Nov 3, 2017 · 0d478a5 · 0d478a5
1 parent 241b5ec
commit 0d478a5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/app/controllers/papers_controller.rb b/app/controllers/papers_controller.rb
@@ -3,6 +3,10 @@ def index
     @papers = Paper.all
   end
 
+  def show
+    @paper = Paper.find(params[:id])
+  end
+
   def new
     @paper = Paper.new
   end
@@ -31,8 +35,11 @@ def update
     end
   end
 
-  def show
+  def destroy
     @paper = Paper.find(params[:id])
+    @paper.destroy
+
+    redirect_to papers_path
   end
 
   private

diff --git a/app/views/papers/index.html.erb b/app/views/papers/index.html.erb
@@ -16,6 +16,9 @@
         <td><%= paper.year %></td>
         <td><%=link_to 'Show', paper %></td>
         <td><%=link_to 'Edit', edit_paper_path(paper) %></td>
+        <td><%=link_to 'Destroy', paper_path(paper),
+                       method: :delete,
+                       data: { confirm: 'Are you sure?' } %></td>
       </tr>
   <% end %>
 </table>
diff --git a/spec/features/paper/index_paper_spec.rb b/spec/features/paper/index_paper_spec.rb
@@ -44,10 +44,10 @@
     FactoryGirl.create :paper
     visit papers_path
 
-    expect(paper.find_by_title('COMPUTING MACHINERY AND INTELLIGENCE')).not_to be_nil
+    expect(Paper.find_by_title('COMPUTING MACHINERY AND INTELLIGENCE')).not_to be_nil
 
     click_link('Destroy')
 
-    expect(paper.find_by_title('COMPUTING MACHINERY AND INTELLIGENCE')).to be_nil
+    expect(Paper.find_by_title('COMPUTING MACHINERY AND INTELLIGENCE')).to be_nil
   end
 end