From e010096f2a9c1f5ddecbad998051b210ba47b3dd Mon Sep 17 00:00:00 2001 From: pboling Date: Thu, 22 Oct 2009 14:59:23 -0400 Subject: fixed tests so that they actually run (and all pass) --- init.rb | 9 +++++---- lib/sms_notifier.rb | 3 +-- test/sms_fu_test.rb | 3 +-- test/test_helper.rb | 9 +++++++++ 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 test/test_helper.rb diff --git a/init.rb b/init.rb index 69ece7c..c5555d9 100644 --- a/init.rb +++ b/init.rb @@ -1,5 +1,6 @@ -require "action_mailer" -require File.dirname(__FILE__) + '/lib/sms_fu' -require File.dirname(__FILE__) + '/lib/sms_fu_helper.rb' +require 'actionmailer' +require 'sms_fu' +require 'sms_fu_helper' + ActionController::Base.send(:include, SMSFu) -ActionView::Base.send(:include, SMSFuHelper) \ No newline at end of file +ActionView::Base.send(:include, SMSFuHelper) diff --git a/lib/sms_notifier.rb b/lib/sms_notifier.rb index 644408a..c028a74 100644 --- a/lib/sms_notifier.rb +++ b/lib/sms_notifier.rb @@ -21,7 +21,6 @@ require 'yaml' # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class SmsNotifier < ActionMailer::Base - @config = YAML::load(File.open("#{RAILS_ROOT}/config/sms_fu.yml")) def sms_message(recipient, message, sender_email) content_type "text/plain" @@ -39,4 +38,4 @@ class SmsNotifier < ActionMailer::Base self.template_root = view_path end -end \ No newline at end of file +end diff --git a/test/sms_fu_test.rb b/test/sms_fu_test.rb index 043763a..c0e278c 100644 --- a/test/sms_fu_test.rb +++ b/test/sms_fu_test.rb @@ -1,5 +1,4 @@ -require 'test/unit' -require 'sms_fu' +require File.dirname(__FILE__) + '/test_helper' class SmsFuTest < Test::Unit::TestCase include SMSFu diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000..0e5ef2c --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,9 @@ +require 'test/unit' +require 'rubygems' + +require 'actionmailer' + +RAILS_ENV = 'test' unless defined?(RAILS_ENV) +RAILS_DEFAULT_LOGGER = Logger.new(StringIO.new) unless defined?(RAILS_DEFAULT_LOGGER) + +require File.join(File.dirname(__FILE__), "..", "init") -- cgit v1.2.3