Download as
Browse Code »

Commit b8cd57204cc8c60238c5a99092d1c9d34a8f197b

Authored by Nick Recobra
2 parents ba0f9a37 e7bd8521
Exists in master and in 1 other branch production

Merge branch 'master' of https://github.com/phallstrom/errbit into phallstrom-master

Showing 3 changed files with 45 additions and 2 deletions   Show diff stats
app/views/errs/show.html.haml
  Diff comments   View file @b8cd572
... ... @@ -8,7 +8,7 @@
8 8 %strong Last Notice:
9 9 = last_notice_at(@err).to_s(:micro)
10 10 - content_for :action_bar do
11   - %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => 'Seriously?', :class => 'resolve' if @err.unresolved?
  11 + %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => (Errbit::Config.confirm_resolve_err === false ? nil : 'Seriously?'), :class => 'resolve' if @err.unresolved?
12 12  
13 13 %h4= @notice.try(:message)
14 14  
... ...
config/config.example.yml
  Diff comments   View file @b8cd572
... ... @@ -17,4 +17,8 @@ email_from: errbit@example.com
17 17 # Configure when emails are sent for an error.
18 18 # [1,3,7] = 1st, 3rd, and 7th occurence triggers
19 19 # an email notification.
20   -email_at_notices: [1, 10, 100]
21 20 \ No newline at end of file
  21 +email_at_notices: [1, 10, 100]
  22 +
  23 +# Set to false to suppress confirmation when
  24 +# resolving errors.
  25 +confirm_resolve_err: true
... ...
spec/views/errs/show.html.haml_spec.rb 0 → 100644
  Diff comments   View file @b8cd572
... ... @@ -0,0 +1,39 @@
  1 +require 'spec_helper'
  2 +
  3 +describe "errs/show.html.erb" do
  4 + before do
  5 + err = Factory(:err)
  6 + assign :err, err
  7 + assign :app, err.app
  8 + assign :notices, err.notices.ordered.paginate(:page => 1, :per_page => 1)
  9 + assign :notice, err.notices.first
  10 + end
  11 +
  12 + describe "content_for :action_bar" do
  13 +
  14 + it "should confirm the 'resolve' link by default" do
  15 + render
  16 + action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
  17 + resolve_link = action_bar.match(/(<a href.*?(class="resolve").*?>)/)[0]
  18 + resolve_link.should =~ /data-confirm="Seriously\?"/
  19 + end
  20 +
  21 + it "should confirm the 'resolve' link if configuration is unset" do
  22 + Errbit::Config.stub(:confirm_resolve_err).and_return(nil)
  23 + render
  24 + action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
  25 + resolve_link = action_bar.match(/(<a href.*?(class="resolve").*?>)/)[0]
  26 + resolve_link.should =~ /data-confirm="Seriously\?"/
  27 + end
  28 +
  29 + it "should not confirm the 'resolve' link if configured not to" do
  30 + Errbit::Config.stub(:confirm_resolve_err).and_return(false)
  31 + render
  32 + action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
  33 + resolve_link = action_bar.match(/(<a href.*?(class="resolve").*?>)/)[0]
  34 + resolve_link.should_not =~ /data-confirm=/
  35 + end
  36 +
  37 + end
  38 +
  39 +end
... ...