Removing degree

app/controllers/degrees.rb

@@ -19,6 +19,15 @@ def add
     render
   end
 
+  def delete
+    @degree = Degree[params[:id]]
+    @university = @degree.university
+    self.title = "Czy na pewno usunąć?"
+    return render if request.get?
+    @degree.destroy
+    redirect(url(:controller => "degrees", :action => "index", :id => @university.id), :message => {:notice => "Kierunek usunięty"})
+  end
+
   def title
     "Kierunki"
   end

app/controllers/universities.rb

@@ -25,7 +25,6 @@ def delete
     self.title = "Czy na pewno usunąć?"
     return render if request.get?
     @university.destroy
-    self.message[:notice] = "Uczelnia usunięta"
     redirect(url(:controller => "universities"), :message => {:notice => "Uczelnia usunięta"})
   end
 

app/views/degrees/delete.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @degree, :action => url(:action => "delete", :id => @degree.id) do %>
+  <%= submit "Tak" %>
+<% end =%>

features/degrees.feature

@@ -15,3 +15,15 @@
     And I follow "Dodaj nowy"
     And I press "Dodaj"
     Then I should see "Wystąpiły błędy"
+
+  Scenario: Removing degree
+    Given a degree exists
+    And university name is "Toniemy Uni"
+    And degree name is "ToNieMy Deg"
+    When I go to "university" page
+    Then I should see "ToNieMy Deg"
+    When I follow "Usuń"
+    And I press "Tak"
+    Then I should be on "university" page
+    And I should see "Kierunek usunięty"
+    And I should not see "ToNieMy Deg"

features/steps/model_creation_steps.rb

@@ -11,3 +11,8 @@
   o.send(("%s=" % [field]).to_sym, value)
   o.save
 end
+
+Given /^a degree exists$/ do
+  @university ||= University.make
+  @degree = Degree.make(:university => @university)
+end