@@ -4,21 +4,11 @@ require "merb-core" require "spec" require "merb_exceptions" -# Mock out Merb bits that a re required for testing -module Merb - module Plugins - def self.config; NotificationSpecHelper.merb_config || {}; end - end - - class Logger - def info(msg=''); msg; end - end - - class << self - def env; 'production'; end - def logger; Logger.new; end - end -end +# merb-exceptions needs to include itself into this class +class Exceptions < Merb::Controller; end + +Merb::Plugins.config[:exceptions][:environments] = 'test' +Merb.start :environment => 'test' module NotificationSpecHelper def mock_details(opts={}) @@ -30,20 +20,7 @@ module NotificationSpecHelper }.merge(opts) end - def default_config - { - :web_hooks => [], - :email_addresses => [], - :app_name => "Merb Application", - :environments => ['production'] - } - end - def mock_merb_config(opts={}) - NotificationSpecHelper.merb_config = {:exceptions => opts} - end - - class << self - attr_accessor :merb_config + Merb::Plugins.config[:exceptions].merge!(opts) end end \ No newline at end of file spec/spec_helper.rb @@ -12,18 +12,6 @@ describe MerbExceptions::Notification do it "should set the detail values to those provided" do Notification.new(mock_details).details.should == mock_details end - - it "should set config defaults when values aren't provided" do - config = Notification.new(mock_details).instance_variable_get(:@config) - config.should == default_config - end - - it "should allow overriding of default configuration options through the Merb::Plugins.config hash" do - opts = { :app_name=>'Testy Mc Testerson', :email_addresses=>['test1@test.com', 'test2@test.com'] } - mock_merb_config(opts) - config = Notification.new(mock_details).instance_variable_get(:@config) - config.should == default_config.merge(opts) - end end describe ".deliver!" do @@ -46,40 +34,45 @@ describe MerbExceptions::Notification do describe ".deliver_web_hooks!" do before :each do - mock_merb_config({ :web_hooks => ['http://www.test1.com', 'http://www.test2.com'] }) + mock_merb_config({:web_hooks => ['http://www.test1.com', 'http://www.test2.com']}) @notification = Notification.new(mock_details) @notification.stub!(:post_hook) end it "should call post_hook for each url" do - @notification.should_receive(:post_hook).once.with('http://www.test1.com') - @notification.should_receive(:post_hook).once.with('http://www.test2.com') + @notification.should_receive(:post_hook). + once.with('http://www.test1.com') + @notification.should_receive(:post_hook). + once.with('http://www.test2.com') @notification.deliver_web_hooks! end end describe ".deliver_emails!" do before :each do - mock_merb_config({ :email_addresses => ['user1@test.com', 'user2@test.com'] }) + mock_merb_config({:email_addresses => ['user1@test.com', 'user2@test.com']}) @notification = Notification.new(mock_details) @notification.stub!(:send_notification_email) end it "should call send_notification_email for each address" do - @notification.should_receive(:send_notification_email).once.with('user1@test.com') - @notification.should_receive(:send_notification_email).once.with('user2@test.com') + @notification.should_receive(:send_notification_email). + once.with('user1@test.com') + @notification.should_receive(:send_notification_email). + once.with('user2@test.com') @notification.deliver_emails! end end + # Running tests with test environment describe ".should_deliver_notifications?" do it "should return true if the current environment is on the config[:environments] list of one item" do - mock_merb_config({ :environments => 'production' }) + mock_merb_config({ :environments => 'test' }) Notification.new(mock_details).should_deliver_notifications?.should be_true end it "should return true if the current environment is on the config[:environments] list as an array" do - mock_merb_config({ :environments => ['staging', 'production'] }) + mock_merb_config({ :environments => ['staging', 'test'] }) Notification.new(mock_details).should_deliver_notifications?.should be_true end @@ -88,4 +81,4 @@ describe MerbExceptions::Notification do Notification.new(mock_details).should_deliver_notifications?.should be_false end end -end \ No newline at end of file +end spec/unit/notification_spec.rb 6f147bfc0512a0c36fef2698250de6ebc37c2078 Martyn Loughran martyn@new-bamboo.co.uk http://github.com/newbamboo/merb_exceptions/commit/e3a28c0915af2c5966d37c2d9ac045ecfde70e1f e3a28c0915af2c5966d37c2d9ac045ecfde70e1f 2008-09-29T10:12:41-07:00 2008-09-29T10:12:41-07:00 Clean out old stuff from specs * Now runs merb in test environment * Use plugin config correctly instead of mocking it all * Remove tests for code no longer in notifications initializer. ecaf7184ef3767dda6eb260384567cb29876d903 Martyn Loughran martyn@new-bamboo.co.uk