diff --git a/app/controllers/notices_controller.rb b/app/controllers/notices_controller.rb index 50c8688..3542556 100644 --- a/app/controllers/notices_controller.rb +++ b/app/controllers/notices_controller.rb @@ -18,7 +18,7 @@ class NoticesController < ApplicationController end render :xml => api_xml else - render :xml => "Notice for old app version ignored" + render :text => "Notice for old app version ignored" end else render :text => "Your API key is unknown", :status => 422 diff --git a/spec/controllers/notices_controller_spec.rb b/spec/controllers/notices_controller_spec.rb index 6641aa5..8effa42 100644 --- a/spec/controllers/notices_controller_spec.rb +++ b/spec/controllers/notices_controller_spec.rb @@ -6,7 +6,7 @@ describe NoticesController do let(:notice) { Fabricate(:notice) } let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read } let(:app) { Fabricate(:app) } - let(:error_report) { double(:valid? => true, :generate_notice! => true, :notice => notice) } + let(:error_report) { double(:valid? => true, :generate_notice! => true, :notice => notice, :should_keep? => true) } context 'notices API' do context "with all params" do diff --git a/spec/models/error_report_spec.rb b/spec/models/error_report_spec.rb index dec7b21..b0d6491 100644 --- a/spec/models/error_report_spec.rb +++ b/spec/models/error_report_spec.rb @@ -230,5 +230,35 @@ describe ErrorReport do end end + describe "#should_keep?" do + context "with current app version not set" do + before do + error_report.app.current_app_version = nil + error_report.server_environment['app-version'] = '1.0' + end + + it "return true" do + expect(error_report.should_keep?).to be true + end + end + + context "with current app version set" do + before do + error_report.app.current_app_version = '1.0' + end + + it "return true if current or newer" do + error_report.server_environment['app-version'] = '1.0' + expect(error_report.should_keep?).to be true + end + + it "return false if older" do + error_report.server_environment['app-version'] = '0.9' + expect(error_report.should_keep?).to be false + end + end + + end + end end -- libgit2 0.21.2