assert 2.17.0 → 2.18.4

data/lib/assert/config.rb

@@ -5,9 +5,7 @@ require "assert/file_line"
 require "assert/utils"
 
 module Assert
-
   class Config
-
     def self.settings(*items)
       items.each do |item|
         define_method(item) do |*args|
@@ -78,7 +76,5 @@ module Assert
     def single_test_file_path
       self.single_test_file_line.file if self.single_test_file_line
     end
-
   end
-
 end

data/lib/assert/config_helpers.rb

@@ -1,7 +1,5 @@
 module Assert
-
   module ConfigHelpers
-
     def runner; self.config.runner; end
     def suite;  self.config.suite;  end
     def view;   self.config.view;   end
@@ -77,7 +75,5 @@ module Assert
     def get_rate(count, time)
       time == 0 ? 0.0 : (count.to_f / time.to_f)
     end
-
   end
-
 end

data/lib/assert/context.rb

@@ -1,4 +1,7 @@
+require "assert/actual_value"
 require "assert/assertions"
+require "assert/context/let_dsl"
+require "assert/context/method_missing"
 require "assert/context/setup_dsl"
 require "assert/context/subject_dsl"
 require "assert/context/suite_dsl"
@@ -10,13 +13,14 @@ require "assert/suite"
 require "assert/utils"
 
 module Assert
-
   class Context
     # put all logic in DSL methods to keep context instances pure for running tests
     extend SetupDSL
     extend SubjectDSL
     extend SuiteDSL
     extend TestDSL
+    extend LetDSL
+    include MethodMissing
     include Assert::Assertions
     include Assert::Macros::Methods
 
@@ -62,9 +66,8 @@ module Assert
       end
     end
 
-    # check if the assertion is a truthy value, if so create a new pass result,
-    # otherwise create a new fail result with the desc and what failed msg.
-    # all other assertion helpers use this one in the end
+    # Check if the result is true. If so, create a new pass result,  Otherwise
+    # create a new fail result with the desc and fail msg.
     def assert(assertion, desc = nil)
       if assertion
         pass
@@ -79,8 +82,8 @@ module Assert
       end
     end
 
-    # the opposite of assert, check if the assertion is a false value, if so create a new pass
-    # result, otherwise create a new fail result with the desc and it's what failed msg
+    # The opposite of assert. Check if the result is false. If so, create a new
+    # pass result. Otherwise create a new fail result with the desc and fail msg.
     def assert_not(assertion, fail_desc = nil)
       assert(!assertion, fail_desc) do
         "Failed assert_not: assertion was "\
@@ -89,6 +92,10 @@ module Assert
     end
     alias_method :refute, :assert_not
 
+    def assert_that(actual_value)
+      Assert::ActualValue.new(actual_value, context: self)
+    end
+
     # adds a Pass result to the end of the test's results
     # does not break test execution
     def pass(pass_msg = nil)
@@ -158,9 +165,12 @@ module Assert
     end
 
     def subject
-      if subj = self.class.subject
-        instance_eval(&subj)
+      unless instance_variable_defined?("@__assert_subject__")
+        @__assert_subject__ =
+          instance_eval(&self.class.subject) if self.class.subject
       end
+
+      @__assert_subject__
     end
 
     def inspect
@@ -190,6 +200,5 @@ module Assert
     def __assert_config__
       @__assert_config__
     end
-
   end
 end

data/lib/assert/context/let_dsl.rb

@@ -0,0 +1,13 @@
+module Assert; end
+class Assert::Context; end
+module Assert::Context::LetDSL
+  def let(name, &block)
+    self.send(:define_method, name, &-> {
+      unless instance_variable_defined?("@__assert_let_#{name}__")
+        instance_variable_set("@__assert_let_#{name}__", instance_eval(&block))
+      end
+
+      instance_variable_get("@__assert_let_#{name}__")
+    })
+  end
+end

data/lib/assert/context/method_missing.rb

@@ -0,0 +1,19 @@
+require "assert/assertions"
+
+module Assert; end
+class Assert::Context; end
+module Assert::Context::MethodMissing
+  def method_missing(method, *args, &block)
+    if Assert::Assertions::IGNORED_ASSERTION_HELPERS.include?(method.to_sym)
+      ignore "The assertion `#{method}` is not supported."\
+             " Please use another assertion or the basic `assert`."
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(method, *)
+    Assert::Assertions::IGNORED_ASSERTION_HELPERS.include?(method.to_sym) ||
+    super
+  end
+end

data/lib/assert/context/setup_dsl.rb

@@ -1,8 +1,6 @@
 module Assert; end
 class Assert::Context
-
   module SetupDSL
-
     def setup_once(&block)
       self.suite.setup(&block)
     end
@@ -70,7 +68,5 @@ class Assert::Context
       # ... before the parent
       self.superclass.run_teardowns(scope) if self.superclass.respond_to?(:run_teardowns)
     end
-
   end
-
 end

data/lib/assert/context/subject_dsl.rb

@@ -1,37 +1,32 @@
 module Assert; end
-class Assert::Context
-
-  module SubjectDSL
-
-    # Add a piece of description text or return the full description for the context
-    def description(text = nil)
-      if text
-        self.descriptions << text.to_s
-      else
-        parent = self.superclass.desc if self.superclass.respond_to?(:desc)
-        own = self.descriptions
-        [parent, *own].compact.reject(&:empty?).join(" ")
-      end
+class Assert::Context; end
+module Assert::Context::SubjectDSL
+  # Add a piece of description text or return the full description for the context
+  def description(text = nil)
+    if text
+      self.descriptions << text.to_s
+    else
+      parent = self.superclass.desc if self.superclass.respond_to?(:desc)
+      own = self.descriptions
+      [parent, *own].compact.reject(&:empty?).join(" ")
     end
-    alias_method :desc, :description
-    alias_method :describe, :description
+  end
+  alias_method :desc, :description
+  alias_method :describe, :description
 
-    def subject(&block)
-      if block_given?
-        @subject = block
-      else
-        @subject || if superclass.respond_to?(:subject)
-          superclass.subject
-        end
+  def subject(&block)
+    if block_given?
+      @subject = block
+    else
+      @subject || if superclass.respond_to?(:subject)
+        superclass.subject
       end
     end
+  end
 
-    protected
-
-    def descriptions
-      @descriptions ||= []
-    end
+  protected
 
+  def descriptions
+    @descriptions ||= []
   end
-
 end

data/lib/assert/context/suite_dsl.rb

@@ -1,8 +1,6 @@
 module Assert; end
 class Assert::Context
-
   module SuiteDSL
-
     def suite(suite_obj = nil)
       if suite_obj
         @suite = suite_obj
@@ -14,7 +12,5 @@ class Assert::Context
         end
       end
     end
-
   end
-
 end

data/lib/assert/context/test_dsl.rb

@@ -5,9 +5,7 @@ require "assert/test"
 
 module Assert; end
 class Assert::Context
-
   module TestDSL
-
     def test(desc_or_macro, called_from = nil, first_caller = nil, &block)
       if desc_or_macro.kind_of?(Assert::Macro)
         instance_eval(&desc_or_macro)
@@ -50,7 +48,5 @@ class Assert::Context
       test_eventually(desc_or_macro, called_from, first_caller || caller_locations.first, &block)
     end
     alias_method :should_skip, :should_eventually
-
   end
-
 end

data/lib/assert/context_info.rb

@@ -1,7 +1,5 @@
 module Assert
-
   class ContextInfo
-
     attr_reader :called_from, :klass, :file
 
     def initialize(klass, called_from = nil, first_caller = nil)
@@ -13,7 +11,5 @@ module Assert
     def test_name(name)
       [klass.description.to_s, name.to_s].compact.reject(&:empty?).join(" ")
     end
-
   end
-
 end

data/lib/assert/default_runner.rb

@@ -1,12 +1,8 @@
 require "assert/runner"
 
 module Assert
-
   # This is the default runner used by assert.  It adds no special behavior on
   # top of the base runner's behavior
-
   class DefaultRunner < Assert::Runner
-
   end
-
 end

data/lib/assert/default_suite.rb

@@ -1,13 +1,10 @@
 require "assert/suite"
 
 module Assert
-
   # This is the default suite used by assert. In addition to the base suite
   # behavior, it accumulates test/result counts in memory.  This data is used
   # by the runner/view for handling and presentation purposes.
-
   class DefaultSuite < Assert::Suite
-
     def initialize(config)
       super
       reset_run_data
@@ -53,7 +50,5 @@ module Assert
       @skip_result_count   = 0
       @ignore_result_count = 0
     end
-
   end
-
 end

data/lib/assert/default_view.rb

@@ -2,10 +2,8 @@ require "assert/view"
 require "assert/view_helpers"
 
 module Assert
-
   # This is the default view used by assert.  It renders ansi test output
   # designed for terminal viewing.
-
   class DefaultView < Assert::View
     include Assert::ViewHelpers::Ansi
 
@@ -184,7 +182,5 @@ module Assert
         end
       end
     end
-
   end
-
 end

data/lib/assert/factory.rb

@@ -1,11 +1,8 @@
 require "much-factory"
 
 module Assert
-
   module Factory
     extend  MuchFactory
     include MuchFactory
-
   end
-
 end

data/lib/assert/file_line.rb

@@ -1,7 +1,5 @@
 module Assert
-
   class FileLine
-
     def self.parse(file_line_path)
       self.new(*(file_line_path.to_s.match(/(^[^\:]*)\:*(\d*).*$/) || [])[1..2])
     end
@@ -24,7 +22,5 @@ module Assert
         super
       end
     end
-
   end
-
 end

data/lib/assert/macro.rb

@@ -1,10 +1,8 @@
 module Assert
   class Macro < ::Proc
-
     # this class is essentially a way to define a custom set of tests using
     # arguments.  When passed as an argument to the "should" method, a macro
     # will be instance_eval'd in that Assert::Context.
-
     attr_accessor :name
 
     def initialize(name = nil, *args, &block)
@@ -12,6 +10,5 @@ module Assert
       @name = name || "run this macro"
       super()
     end
-
   end
 end

data/lib/assert/macros/methods.rb

@@ -2,13 +2,11 @@ require "assert/macro"
 
 module Assert::Macros
   module Methods
-
     def self.included(receiver)
       receiver.send(:extend, ClassMethods)
     end
 
     module ClassMethods
-
       def have_instance_method(*methods)
         called_from = (methods.last.kind_of?(Array) ? methods.pop : caller_locations).first
         Assert::Macro.new do
@@ -101,35 +99,33 @@ module Assert::Macros
 
       def _methods_macro_test(called_from)
         @_methods_macro_test ||= test "should respond to methods", called_from do
-
           self.class._methods_macro_instance_methods.each do |(method, called_from)|
             msg = "#{subject.class.name} does not have instance method ##{method}"
             with_backtrace([called_from]) do
-              assert_respond_to method, subject, msg
+              assert_that(subject).responds_to(method, msg)
             end
           end
 
           self.class._methods_macro_class_methods.each do |(method, called_from)|
             msg = "#{subject.class.name} does not have class method ##{method}"
             with_backtrace([called_from]) do
-              assert_respond_to method, subject.class, msg
+              assert_that(subject.class).responds_to(method, msg)
             end
           end
 
           self.class._methods_macro_not_instance_methods.each do |(method, called_from)|
             msg = "#{subject.class.name} has instance method ##{method}"
             with_backtrace([called_from]) do
-              assert_not_respond_to method, subject, msg
+              assert_that(subject).does_not_respond_to(method, msg)
             end
           end
 
           self.class._methods_macro_not_class_methods.each do |(method, called_from)|
             msg = "#{subject.class.name} has class method ##{method}"
             with_backtrace([called_from]) do
-              assert_not_respond_to method, subject.class, msg
+              assert_that(subject.class).does_not_respond_to(method, msg)
             end
           end
-
         end
       end
 
@@ -148,8 +144,6 @@ module Assert::Macros
       def _methods_macro_not_class_methods
         @_methods_macro_not_class_methods ||= []
       end
-
     end
-
   end
 end

data/lib/assert/result.rb

@@ -2,7 +2,6 @@ require "assert/file_line"
 
 module Assert; end
 module Assert::Result
-
   class Base          ; end
   class Pass   < Base ; end
   class Ignore < Base ; end
@@ -26,7 +25,6 @@ module Assert::Result
   end
 
   class Base
-
     def self.type; :unknown; end
     def self.name; "";       end
 
@@ -156,7 +154,7 @@ module Assert::Result
     end
 
     # if the filtered backtrace is empty, just use the backtrace itself (this
-    # should only occur if the result is an error from a line in assert's
+    # should only occur if the result is an error from a line in Assert's
     # non-test code).
     def first_filtered_bt_line(backtrace)
       ((fbt = backtrace.filtered).empty? ? backtrace : fbt).first.to_s
@@ -164,17 +162,13 @@ module Assert::Result
   end
 
   class Pass < Base
-
     def self.type; :pass;  end
     def self.name; "Pass"; end
-
   end
 
   class Ignore < Base
-
     def self.type; :ignore;  end
     def self.name; "Ignore"; end
-
   end
 
   class HaltingTestResultError < RuntimeError
@@ -185,7 +179,6 @@ module Assert::Result
   TestFailure = Class.new(HaltingTestResultError)
 
   class Fail < Base
-
     def self.type; :fail;  end
     def self.name; "Fail"; end
 
@@ -201,14 +194,12 @@ module Assert::Result
         super(test, msg_or_err, bt)
       end
     end
-
   end
 
   # raised by the "skip" context helper to break test execution
   TestSkipped = Class.new(HaltingTestResultError)
 
   class Skip < Base
-
     def self.type; :skip;  end
     def self.name; "Skip"; end
 
@@ -224,11 +215,9 @@ module Assert::Result
         super(test, msg_or_err, bt)
       end
     end
-
   end
 
   class Error < Base
-
     def self.type; :error;  end
     def self.name; "Error"; end
 
@@ -247,11 +236,9 @@ module Assert::Result
     def build_trace
       Backtrace.to_s(backtrace)
     end
-
   end
 
   class Backtrace < ::Array
-
     DELIM = "\n".freeze
 
     def self.parse(bt)
@@ -272,7 +259,7 @@ module Assert::Result
 
     protected
 
-    # filter a line out if it's an assert lib/bin line
+    # filter a line out if it's an Assert lib/bin line
     def filter_out?(line)
       # "./lib" in project dir, or "/usr/local/blahblah" if installed
       assert_lib_path    = File.expand_path("../..", __FILE__)
@@ -283,7 +270,5 @@ module Assert::Result
       ) ||
       line =~ assert_bin_regex
     end
-
   end
-
 end