raygun4ruby 3.2.5.pre → 4.0.0.pre

data/test/test_helper.rb

@@ -1,72 +1,76 @@
-ENV['RACK_ENV'] = 'test'
-require_relative "../lib/raygun.rb"
-require "minitest/autorun"
-require "minitest/pride"
-require "timecop"
-require "mocha/minitest"
-require 'stringio'
-require 'webmock/minitest'
-
-class FakeLogger
-  def initialize
-    @logger = StringIO.new
-  end
-
-  def info(message)
-    @logger.write(message)
-  end
-
-  def reset
-    @logger.string = ""
-  end
-
-  def get
-    @logger.string
-  end
-end
-
-class NoApiKey < StandardError; end
-
-class Raygun::IntegrationTest < Minitest::Test
-
-  def setup
-    Raygun.setup do |config|
-      config.api_key = File.open(File.expand_path("~/.raygun4ruby-test-key"), "rb").read
-      config.version = Raygun::VERSION
-    end
-
-  rescue Errno::ENOENT
-    raise NoApiKey.new("Place a valid Raygun API key into ~/.raygun4ruby-test-key to run integration tests") unless api_key
-  end
-
-  def teardown
-  end
-
-end
-
-class Raygun::UnitTest < MiniTest::Test
-
-  def setup
-    Raygun.configuration.api_key = "test api key"
-  end
-
-  def teardown
-    reset_configuration
-  end
-
-  def fake_successful_entry
-    stub_request(:post, 'https://api.raygun.com/entries').to_return(status: 202)
-  end
-
-  def reset_configuration
-    Raygun.configuration = Raygun::Configuration.new
-  end
-
-  def setup_logging
-    logger = FakeLogger.new
-    Raygun.configuration.debug = true
-    Raygun.configuration.logger = logger
-
-    logger
-  end
-end
+ENV['RACK_ENV'] = 'test'
+require "minitest/autorun"
+require "minitest/pride"
+require "timecop"
+require "mocha/minitest"
+require "stringio"
+require "webmock/minitest"
+
+require_relative "./rails_helper"
+require_relative "../lib/raygun.rb"
+
+# Ensure we start with a known state
+Raygun.reset_configuration
+
+class FakeLogger
+  def initialize
+    @logger = StringIO.new
+  end
+
+  def info(message)
+    @logger.write(message)
+  end
+
+  def reset
+    @logger.string = ""
+  end
+
+  def get
+    @logger.string
+  end
+end
+
+class NoApiKey < StandardError; end
+
+class Raygun::IntegrationTest < Minitest::Test
+
+  def setup
+    Raygun.setup do |config|
+      config.api_key = File.open(File.expand_path("~/.raygun4ruby-test-key"), "rb").read
+      config.version = Raygun::VERSION
+    end
+
+  rescue Errno::ENOENT
+    raise NoApiKey.new("Place a valid Raygun API key into ~/.raygun4ruby-test-key to run integration tests") unless api_key
+  end
+
+  def teardown
+    Raygun.wait_for_futures
+    Raygun.reset_configuration
+  end
+
+end
+
+class Raygun::UnitTest < Minitest::Test
+
+  def setup
+    Raygun.configuration.api_key = "test api key"
+  end
+
+  def teardown
+    Raygun.wait_for_futures
+    Raygun.reset_configuration
+  end
+
+  def fake_successful_entry
+    stub_request(:post, 'https://api.raygun.com/entries').to_return(status: 202)
+  end
+
+  def setup_logging
+    logger = FakeLogger.new
+    Raygun.configuration.debug = true
+    Raygun.configuration.logger = logger
+
+    logger
+  end
+end

data/test/unit/affected_user_test.rb

@@ -1,136 +1,136 @@
-require_relative "../test_helper.rb"
-require 'ostruct'
-require 'raygun/middleware/rails_insert_affected_user'
-
-class AffectedUserTest < Raygun::UnitTest
-
-  class TestException < StandardError; end
-
-  class MockController
-
-    def user_with_email
-      OpenStruct.new(id: 123, email: "testemail@something.com")
-    end
-
-    def user_with_login
-      OpenStruct.new(login: "topsecret")
-    end
-
-    def user_with_full_details
-      OpenStruct.new(id: 123, email: "testemail@something.com", first_name: "Taylor", last_name: "Lodge")
-    end
-
-    def user_as_string
-      "some-string-identifier"
-    end
-
-    def no_logged_in_user
-    end
-
-    private
-
-      def private_current_user
-        user_with_email
-      end
-
-  end
-
-  class MockApp
-    attr_accessor :env
-
-    def call(env)
-      @env = env
-      raise TestException.new
-    end
-  end
-
-  def setup
-    super
-    @client = Raygun::Client.new
-    fake_successful_entry
-
-    @app        = MockApp.new
-    @controller = MockController.new
-    @middleware = Raygun::Middleware::RailsInsertAffectedUser.new(@app)
-  end
-
-  def test_inserting_user_object_with_email
-    Raygun.configuration.affected_user_method = :user_with_email
-    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
-
-    begin
-      @middleware.call("action_controller.instance" => @controller)
-    rescue TestException
-      user_hash = { :identifier => 123, :email => "testemail@something.com", :isAnonymous => false }
-      assert_equal user_hash, @app.env["raygun.affected_user"]
-    end
-  end
-
-  def test_changing_method_mapping
-    Raygun.configuration.affected_user_method = :user_with_login
-    Raygun.configuration.affected_user_mapping = {
-      identifier: :login
-    }
-
-    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
-
-    begin
-      @middleware.call("action_controller.instance" => @controller)
-    rescue TestException
-      user_hash = { :identifier => "topsecret", :isAnonymous => false }
-      assert_equal user_hash, @app.env["raygun.affected_user"]
-    end
-  end
-
-  def test_inserting_user_as_plain_string
-    Raygun.configuration.affected_user_method = :user_as_string
-    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
-
-    begin
-      @middleware.call("action_controller.instance" => @controller)
-    rescue TestException
-      user_hash = { :identifier => "some-string-identifier", :isAnonymous => true }
-      assert_equal user_hash, @app.env["raygun.affected_user"]
-    end
-  end
-
-  def test_with_a_nil_user
-    Raygun.configuration.affected_user_method = :no_logged_in_user
-    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
-
-    begin
-      @middleware.call("action_controller.instance" => @controller)
-    rescue TestException
-      user_hash = { :isAnonymous => true }
-      assert_equal user_hash, @app.env["raygun.affected_user"]
-    end
-  end
-
-  def test_with_private_method
-    Raygun.configuration.affected_user_method = :private_current_user
-    assert @controller.respond_to?(Raygun.configuration.affected_user_method, true)
-
-    begin
-      @middleware.call("action_controller.instance" => @controller)
-    rescue TestException
-      user_hash = {:isAnonymous=>false, :identifier=>123, :email=>"testemail@something.com"}
-      assert_equal user_hash, @app.env["raygun.affected_user"]
-    end
-  end
-
-  def test_with_proc_for_mapping
-    Raygun.configuration.affected_user_method = :user_with_full_details
-    Raygun.configuration.affected_user_mapping = Raygun::AffectedUser::DEFAULT_MAPPING.merge({
-      full_name: ->(user) { "#{user.first_name} #{user.last_name}" }
-    })
-
-    assert @controller.respond_to?(Raygun.configuration.affected_user_method, true)
-
-    begin
-      @middleware.call("action_controller.instance" => @controller)
-    rescue TestException
-      user_hash = {:isAnonymous=>false, :identifier=>123, :email=>"testemail@something.com", :fullName => "Taylor Lodge", :firstName => "Taylor"}
-      assert_equal user_hash, @app.env["raygun.affected_user"]
-    end
-  end
-end
+require_relative "../test_helper.rb"
+require 'ostruct'
+require 'raygun/middleware/rails_insert_affected_user'
+
+class AffectedUserTest < Raygun::UnitTest
+
+  class TestException < StandardError; end
+
+  class MockController
+
+    def user_with_email
+      OpenStruct.new(id: 123, email: "testemail@something.com")
+    end
+
+    def user_with_login
+      OpenStruct.new(login: "topsecret")
+    end
+
+    def user_with_full_details
+      OpenStruct.new(id: 123, email: "testemail@something.com", first_name: "Taylor", last_name: "Lodge")
+    end
+
+    def user_as_string
+      "some-string-identifier"
+    end
+
+    def no_logged_in_user
+    end
+
+    private
+
+      def private_current_user
+        user_with_email
+      end
+
+  end
+
+  class MockApp
+    attr_accessor :env
+
+    def call(env)
+      @env = env
+      raise TestException.new
+    end
+  end
+
+  def setup
+    super
+    @client = Raygun::Client.new
+    fake_successful_entry
+
+    @app        = MockApp.new
+    @controller = MockController.new
+    @middleware = Raygun::Middleware::RailsInsertAffectedUser.new(@app)
+  end
+
+  def test_inserting_user_object_with_email
+    Raygun.configuration.affected_user_method = :user_with_email
+    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
+
+    begin
+      @middleware.call("action_controller.instance" => @controller)
+    rescue TestException
+      user_hash = { :identifier => 123, :email => "testemail@something.com", :isAnonymous => false }
+      assert_equal user_hash, @app.env["raygun.affected_user"]
+    end
+  end
+
+  def test_changing_method_mapping
+    Raygun.configuration.affected_user_method = :user_with_login
+    Raygun.configuration.affected_user_mapping = {
+      identifier: :login
+    }
+
+    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
+
+    begin
+      @middleware.call("action_controller.instance" => @controller)
+    rescue TestException
+      user_hash = { :identifier => "topsecret", :isAnonymous => false }
+      assert_equal user_hash, @app.env["raygun.affected_user"]
+    end
+  end
+
+  def test_inserting_user_as_plain_string
+    Raygun.configuration.affected_user_method = :user_as_string
+    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
+
+    begin
+      @middleware.call("action_controller.instance" => @controller)
+    rescue TestException
+      user_hash = { :identifier => "some-string-identifier", :isAnonymous => true }
+      assert_equal user_hash, @app.env["raygun.affected_user"]
+    end
+  end
+
+  def test_with_a_nil_user
+    Raygun.configuration.affected_user_method = :no_logged_in_user
+    assert @controller.respond_to?(Raygun.configuration.affected_user_method)
+
+    begin
+      @middleware.call("action_controller.instance" => @controller)
+    rescue TestException
+      user_hash = { :isAnonymous => true }
+      assert_equal user_hash, @app.env["raygun.affected_user"]
+    end
+  end
+
+  def test_with_private_method
+    Raygun.configuration.affected_user_method = :private_current_user
+    assert @controller.respond_to?(Raygun.configuration.affected_user_method, true)
+
+    begin
+      @middleware.call("action_controller.instance" => @controller)
+    rescue TestException
+      user_hash = {:isAnonymous=>false, :identifier=>123, :email=>"testemail@something.com"}
+      assert_equal user_hash, @app.env["raygun.affected_user"]
+    end
+  end
+
+  def test_with_proc_for_mapping
+    Raygun.configuration.affected_user_method = :user_with_full_details
+    Raygun.configuration.affected_user_mapping = Raygun::AffectedUser::DEFAULT_MAPPING.merge({
+      full_name: ->(user) { "#{user.first_name} #{user.last_name}" }
+    })
+
+    assert @controller.respond_to?(Raygun.configuration.affected_user_method, true)
+
+    begin
+      @middleware.call("action_controller.instance" => @controller)
+    rescue TestException
+      user_hash = {:isAnonymous=>false, :identifier=>123, :email=>"testemail@something.com", :fullName => "Taylor Lodge", :firstName => "Taylor"}
+      assert_equal user_hash, @app.env["raygun.affected_user"]
+    end
+  end
+end