Merge pull request #228 from jmonteiro/error_code

Notice XML now returns notice ID

Merge pull request #228 from jmonteiro/error_code
Notice XML now returns notice ID
Marcin Ciunelis
2 parents 483bfce2 0f2d7f55
Showing 3 changed files with 45 additions and 8 deletions Show diff stats
app/controllers/notices_controller.rb
config/routes.rb
spec/controllers/notices_controller_spec.rb
@@ -5,9 +5,17 @@ class NoticesController &lt; ApplicationController
   def create
     # params[:data] if the notice came from a GET request, raw_post if it came via POST
-    @notice = App.report_error!(params[:data] || request.raw_post)
-    respond_with @notice
+    notice = App.report_error!(params[:data] || request.raw_post)
+    api_xml = notice.to_xml(:only => false, :methods => [:id]) do |xml|
+      xml.url locate_url(notice.id, :host => Errbit::Config.host)
+    end
+    render :xml => api_xml
   end
+  # Redirects a notice to the problem page. Useful when using User Information at Airbrake gem.
+  def locate
+    problem = Notice.find(params[:id]).problem
+    redirect_to app_err_path(problem.app, problem)
+  end
 end
@@ -4,6 +4,7 @@ Errbit::Application.routes.draw do
   # Hoptoad Notifier Routes
   match '/notifier_api/v2/notices' => 'notices#create'
+  match '/locate/:id' => 'notices#locate', :as => :locate
   match '/deploys.txt' => 'deploys#create'
   resources :notices,   :only => [:show]
 require 'spec_helper'
 describe NoticesController do
+  it_requires_authentication :for => { :locate => :get }
+
+  let(:app) { Fabricate(:app) }
   context 'notices API' do
     before do
@@ -8,25 +11,34 @@ describe NoticesController do
       @app = Fabricate(:app_with_watcher)
       App.stub(:find_by_api_key!).and_return(@app)
       @notice = App.report_error!(@xml)
-
-      request.env['Content-type'] = 'text/xml'
-      request.env['Accept'] = 'text/xml, application/xml'
     end
     it "generates a notice from xml [POST]" do
       App.should_receive(:report_error!).with(@xml).and_return(@notice)
       request.should_receive(:raw_post).and_return(@xml)
-      post :create
+      post :create, :format => :xml
+      response.should be_success
+      # Same RegExp from Airbrake::Sender#send_to_airbrake (https://github.com/airbrake/airbrake/blob/master/lib/airbrake/sender.rb#L53)
+      # Inspired by https://github.com/airbrake/airbrake/blob/master/test/sender_test.rb
+      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
+      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
     end
     it "generates a notice from xml [GET]" do
       App.should_receive(:report_error!).with(@xml).and_return(@notice)
-      get :create, {:data => @xml}
+      get :create, :data => @xml, :format => :xml
+      response.should be_success
+      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
+      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
     end
     it "sends a notification email" do
+      App.should_receive(:report_error!).with(@xml).and_return(@notice)
       request.should_receive(:raw_post).and_return(@xml)
-      post :create
+      post :create, :format => :xml
+      response.should be_success
+      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
+      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
       email = ActionMailer::Base.deliveries.last
       email.to.should include(@app.watchers.first.email)
       email.subject.should include(@notice.message)
@@ -35,5 +47,21 @@ describe NoticesController do
     end
   end
+  describe "GET /locate/:id" do
+    context 'when logged in as an admin' do
+      before(:each) do
+        @user = Fabricate(:admin)
+        sign_in @user
+      end
+
+      it "should locate notice and redirect to problem" do
+        problem = Fabricate(:problem, :app => app, :environment => "production")
+        notice = Fabricate(:notice, :err => Fabricate(:err, :problem => problem))
+        get :locate, :id => notice.id
+        response.should redirect_to(app_err_path(problem.app, problem))
+      end
+    end
+  end
+
 end
	@@ -5,9 +5,17 @@ class NoticesController < ApplicationController		@@ -5,9 +5,17 @@ class NoticesController < ApplicationController
5		5
6	def create	6	def create
7	# params[:data] if the notice came from a GET request, raw_post if it came via POST	7	# params[:data] if the notice came from a GET request, raw_post if it came via POST
8	- @notice = App.report_error!(params[:data] \|\| request.raw_post)
9	- respond_with @notice	8	+ notice = App.report_error!(params[:data] \|\| request.raw_post)
		9	+ api_xml = notice.to_xml(:only => false, :methods => [:id]) do \|xml\|
		10	+ xml.url locate_url(notice.id, :host => Errbit::Config.host)
		11	+ end
		12	+ render :xml => api_xml
10	end	13	end
11		14
		15	+ # Redirects a notice to the problem page. Useful when using User Information at Airbrake gem.
		16	+ def locate
		17	+ problem = Notice.find(params[:id]).problem
		18	+ redirect_to app_err_path(problem.app, problem)
		19	+ end
12	end	20	end
13		21
	@@ -4,6 +4,7 @@ Errbit::Application.routes.draw do		@@ -4,6 +4,7 @@ Errbit::Application.routes.draw do
4		4
5	# Hoptoad Notifier Routes	5	# Hoptoad Notifier Routes
6	match '/notifier_api/v2/notices' => 'notices#create'	6	match '/notifier_api/v2/notices' => 'notices#create'
		7	+ match '/locate/:id' => 'notices#locate', :as => :locate
7	match '/deploys.txt' => 'deploys#create'	8	match '/deploys.txt' => 'deploys#create'
8		9
9	resources :notices, :only => [:show]	10	resources :notices, :only => [:show]