gmalamid-synthesis 0.1.7 → 0.1.8

data/README

@@ -92,7 +92,7 @@ Reporting the location (filename and line number) of tested/untested expectation
 
 == Contributors
 
-Danilo Sato, Paul Nasrat
+Danilo Sato, Paul Nasrat, Jerome Riga
 
 == Discuss
 

data/lib/synthesis/adapter/expectations.rb

@@ -12,12 +12,12 @@ module Synthesis
     
     def collect_expectations
       ignore_instances_of Class::AnyInstance
-      Object.extend(ExpectationRecordEnabled)
+      Object.extend(ExpectationRecorder)
       Object.record_expectations_on(:expects)
       Mocha::Expectation.extend(ExpectationInterceptor)
-      Mocha::Expectation.record_expected_arguments_on(:with)
-      Mocha::Expectation.record_expected_return_values_on(:returns)
-      Mocha::Expectation.record_expected_return_values_on(:raises)
+      Mocha::Expectation.intercept_expected_arguments_on(:with)
+      Mocha::Expectation.intercept_expected_return_values_on(:returns)
+      Mocha::Expectation.intercept_expected_return_values_on(:raises)
       Mocha::Expectation.remove_expectation_on(:never)
     end
     

data/lib/synthesis/adapter/mocha.rb

@@ -13,12 +13,12 @@ module Synthesis
     
     def collect_expectations
       ignore_instances_of Class::AnyInstance
-      Object.extend(ExpectationRecordEnabled)
+      Object.extend(ExpectationRecorder)
       Object.record_expectations_on(:expects)
       Mocha::Expectation.extend(ExpectationInterceptor)
-      Mocha::Expectation.record_expected_arguments_on(:with)
-      Mocha::Expectation.record_expected_return_values_on(:returns)
-      Mocha::Expectation.record_expected_return_values_on(:raises)
+      Mocha::Expectation.intercept_expected_arguments_on(:with)
+      Mocha::Expectation.intercept_expected_return_values_on(:returns)
+      Mocha::Expectation.intercept_expected_return_values_on(:raises)
       Mocha::Expectation.remove_expectation_on(:never)
     end
     

data/lib/synthesis/adapter/rspec.rb

@@ -7,22 +7,28 @@ require File.dirname(__FILE__) + "/../../synthesis"
 module Synthesis
   class RSpecAdapter < Adapter
     def run
-      Synthesis.rspec_runner_options.files.clear
       fail_unless do
-        Synthesis.rspec_runner_options.instance_variable_set(:@formatters, nil)
+        rspec_options = begin
+          Spec::Runner.options
+        rescue
+          rspec_options
+        end
+        
+        rspec_options.files.clear
+        rspec_options.instance_variable_set(:@formatters, nil)
+        rspec_options.run_examples
         # Synthesis.rspec_runner_options.instance_variable_set(:@format_options, [["profile", STDOUT]])
-        Synthesis.rspec_runner_options.run_examples
       end
     end
     
     def collect_expectations
       ignore_instances_of Spec::Mocks::Mock
-      Spec::Mocks::Methods.extend(ExpectationRecordEnabled)
+      Spec::Mocks::Methods.extend(ExpectationRecorder)
       Spec::Mocks::Methods.record_expectations_on(:should_receive)
       Spec::Mocks::MessageExpectation.extend(ExpectationInterceptor)
-      Spec::Mocks::MessageExpectation.record_expected_arguments_on(:with)
-      Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_return)
-      Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_raise)
+      Spec::Mocks::MessageExpectation.intercept_expected_arguments_on(:with)
+      Spec::Mocks::MessageExpectation.intercept_expected_return_values_on(:and_return)
+      Spec::Mocks::MessageExpectation.intercept_expected_return_values_on(:and_raise)
       Spec::Mocks::MessageExpectation.remove_expectation_on(:never)
     end
     
@@ -31,10 +37,4 @@ module Synthesis
       Spec::Mocks::Methods.stop_recording!
     end
   end
-  
-  def rspec_runner_options
-    Spec::Runner.options rescue rspec_options
-  end
-  
-  module_function :rspec_runner_options
 end

data/lib/synthesis/expectation_interceptor.rb

@@ -5,7 +5,7 @@ module Synthesis
   module ExpectationInterceptor
     # Intercept the mock object framework's expectation method for declaring a mocked
     # method's arguments so that Synthesis can record them.
-    def record_expected_arguments_on(method_name)
+    def intercept_expected_arguments_on(method_name)
       (@original_methods ||= []) << method_name
       
       class_eval do
@@ -25,7 +25,7 @@ module Synthesis
     
     # Intercept the mock object framework's expectation method for declaring a mocked
     # method's return values so that Synthesis can record them.
-    def record_expected_return_values_on(method_name)
+    def intercept_expected_return_values_on(method_name)
       (@original_methods ||= []) << method_name
       
       class_eval do

data/lib/synthesis/{expectation_record_enabled.rb → expectation_recorder.rb}

@@ -2,7 +2,7 @@ module Synthesis
   # Extend by the mock object framework's construct for declaring a
   # mock object so that Synthesis can tap into it in order to record
   # the expectation.
-  module ExpectationRecordEnabled
+  module ExpectationRecorder
     # Intercept the mock object framework's method for declaring a mock
     # object so that Synthesis can record it.
     def record_expectations_on(method_name)
@@ -25,7 +25,7 @@ module Synthesis
       end
     end
     
-    # Restore the original methods ExpectationRecordEnabled has rewritten and
+    # Restore the original methods ExpectationRecorder has rewritten and
     # undefine their intercepted counterparts.
     def stop_recording!
       method_name = @original_expects

data/lib/synthesis.rb

@@ -12,6 +12,6 @@ require "synthesis/method_invocation_watcher"
 require "synthesis/expectation"
 require "synthesis/expectation_matcher"
 require "synthesis/expectation_interceptor"
-require "synthesis/expectation_record_enabled"
+require "synthesis/expectation_recorder"
 require "synthesis/reporter"
 require "synthesis/adapter"

data/synthesis.gemspec

@@ -1,6 +1,6 @@
 GEMSPEC =Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.1.7'
+  s.version = '0.1.8'
   s.platform = Gem::Platform::RUBY
   s.rubyforge_project = "synthesis"
   s.summary, s.description = 'A tool for Synthesized Testing'
@@ -24,7 +24,7 @@ GEMSPEC =Gem::Specification.new do |s|
     "lib/synthesis/expectation_interceptor.rb",
     "lib/synthesis/expectation_matcher.rb",
     "lib/synthesis/expectation_record.rb",
-    "lib/synthesis/expectation_record_enabled.rb",
+    "lib/synthesis/expectation_recorder.rb",
     "lib/synthesis/logging.rb",
     "lib/synthesis/method_invocation_watcher.rb",
     "lib/synthesis/module.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gmalamid-synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -36,7 +36,7 @@ files:
 - lib/synthesis/expectation_interceptor.rb
 - lib/synthesis/expectation_matcher.rb
 - lib/synthesis/expectation_record.rb
-- lib/synthesis/expectation_record_enabled.rb
+- lib/synthesis/expectation_recorder.rb
 - lib/synthesis/logging.rb
 - lib/synthesis/method_invocation_watcher.rb
 - lib/synthesis/module.rb