Merge pull request #358 from zetaben/feature/move_destroy

Move destroy application link from show page to edit page

Merge pull request #358 from zetaben/feature/move_destroy
Move destroy application link from show page to edit page
Vasiliy Ermolovich
2 parents 7198744a ce2443a1
Showing 3 changed files with 24 additions and 1 deletions Show diff stats
app/views/apps/edit.html.haml
app/views/apps/show.html.haml
spec/views/apps/edit.html.haml_spec.rb
 - content_for :title, 'Edit App'
 - content_for :action_bar do
   = link_to_copy_attributes_from_other_app
+  = link_to 'destroy application', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
   = link_to('cancel', app_path(@app), :class => 'button')
 = form_for @app do |f|
@@ -11,7 +11,6 @@
 - content_for :action_bar do
   - if current_user.admin?
     = link_to 'edit', edit_app_path(@app), :class => 'button'
-    = link_to 'destroy', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
   - if @all_errs
     = link_to 'unresolved errs', app_path(@app), :class => 'button'
   - else
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "apps/edit.html.haml" do
+  before do
+    app = stub_model(App)
+    assign :app, app
+    controller.stub(:current_user) { stub_model(User) }
+  end
+
+  describe "content_for :action_bar" do
+    def action_bar
+      view.content_for(:action_bar)
+    end
+
+    it "should confirm the 'destroy' link" do
+      render
+
+      action_bar.should have_selector('a.button[data-confirm="Seriously?"]')
+    end
+
+  end
+end
+
1	- content_for :title, 'Edit App'	1	- content_for :title, 'Edit App'
2	- content_for :action_bar do	2	- content_for :action_bar do
3	= link_to_copy_attributes_from_other_app	3	= link_to_copy_attributes_from_other_app
		4	+ = link_to 'destroy application', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
4	= link_to('cancel', app_path(@app), :class => 'button')	5	= link_to('cancel', app_path(@app), :class => 'button')
5		6
6	= form_for @app do \|f\|	7	= form_for @app do \|f\|
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "apps/edit.html.haml" do
	4	+ before do
	5	+ app = stub_model(App)
	6	+ assign :app, app
	7	+ controller.stub(:current_user) { stub_model(User) }
	8	+ end
	9	+
	10	+ describe "content_for :action_bar" do
	11	+ def action_bar
	12	+ view.content_for(:action_bar)
	13	+ end
	14	+
	15	+ it "should confirm the 'destroy' link" do
	16	+ render
	17	+
	18	+ action_bar.should have_selector('a.button[data-confirm="Seriously?"]')
	19	+ end
	20	+
	21	+ end
	22	+end
	23	+