test-prof 0.6.0.pre1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb97ad09442483992d4d0618362de046dae7a5ed4e17f909a8bcbbffe9fc827f
-  data.tar.gz: d477bbede59c0b94f21181e830bef6f346c1abb6d6fb1c683a582ad237ec9c2a
+  metadata.gz: 03ab3753dd924402ef2d09973165d82d17d2e72c26ad317e6513111ff1b93166
+  data.tar.gz: 93cbd1952a5054e0c2f76058e227a6e03c0bb6b050f20a74d54fd57b85401e69
 SHA512:
-  metadata.gz: d0f049f6e75ed08c3474f58cdbca386ca3c7418223abd51a3e9c7d3d8ab207c68527133b2901de725531044a778de48b8dbf3eab1243bdc16e60f53ed9e2ea80
-  data.tar.gz: e97987b38878cdf5b29328204fa39d6e364ddbc84fff8bfe322449b02ec2bc4203417f35cc2d9fb82f79dc88c99e4241a1f5979ea11987175d5c806a8ec56965
+  metadata.gz: 6f6a2ed0ba54bf9c4e0633b842fa5c961ab832f4a45013e44ae68804c1714b6708be22505c7b6de38a6e90a2661f64c684efefbb07d1569ef22cbdf17d5cef57
+  data.tar.gz: 79fa0b40361b533cde8f26c45ed66add0a70cad73f59c5ddcabe6f2997fb944293b36a33f557e4870667a7f023e84219216ef6d4e1ee9d54b316ac038cb281e3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.6.0 (2018-06-29)
+
+### Features
+
 - Add `EventProf.monitor` to instrument arbitrary methods. ([@palkan][])
 
 Add custom instrumetation easily:
@@ -17,14 +21,20 @@ end
 TestProf::EventProf.monitor(Work, "my.work", :do)
 ```
 
+[📝 Docs](https://test-prof.evilmartians.io/#/event_prof?id=profile-arbitrary-methods)
+
 - Adapterize `before_all`. ([@palkan][])
 
 Now it's possible to write your own adapter for `before_all` to manage
 transactions.
 
+[📝 Docs](https://test-prof.evilmartians.io/#/before_all?id=database-adapters)
+
 - Add `before_all` for Minitest. ([@palkan][])
 
-- Refactor `:with_clean_fixture` to clean data once per group. ([@palkan][])
+[📝 Docs](https://test-prof.evilmartians.io/#/before_all?id=minitest-experimental)
+
+### Fixes & Improvements
 
 - Show top `let` declarations per example group in RSpecDissect profiler. ([@palkan][])
 
@@ -49,8 +59,18 @@ TestProf::RSpecDissect.configure do |config|
 end
 ```
 
+- [Fix [#80](https://github.com/palkan/test-prof/issues/80)] Added ability to preserve traits. ([@Vasfed][])
+
+Disabled by default for compatibility. Enable globally by `FactoryDefault.preserve_traits = true` or for single `create_default`: `create_default(:user, preserve_traits: true)`
+
+When enabled - default object will be used only when there's no [traits](https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#traits) in association.
+
 - Add ability to run only `let` or `before` profiler with RSpecDissect. ([@palkan][])
 
+- Collect _raw_ data with StackProf by default. ([@palkan][])
+
+- Refactor `:with_clean_fixture` to clean data once per group. ([@palkan][])
+
 - [Fix [#75](https://github.com/palkan/test-prof/issues/75)] Fix `RSpec/Aggregate` failures with non-regular examples. ([@palkan][])
 
 Do not take into account `xit`, `pending`, `its`, etc. examples,
@@ -312,3 +332,4 @@ Ensure output dir exists in `#artifact_path` method.
 [@IDolgirev]: https://github.com/IDolgirev
 [@desoleary]: https://github.com/desoleary
 [@rabotyaga]: https://github.com/rabotyaga
+[@Vasfed]: https://github.com/Vasfed

data/README.md

@@ -32,7 +32,7 @@ Of course, we have some [solutions](https://test-prof.evilmartians.io/#/?id=reci
 
 Supported Ruby versions:
 
-- Ruby (MRI) >= 2.2.0
+- Ruby (MRI) >= 2.2.0 (**NOTE:** the next release will require 2.3+)
 
 - JRuby >= 9.1.0.0
 

data/lib/test_prof/factory_default.rb

@@ -9,18 +9,21 @@ module TestProf
   module FactoryDefault
     module DefaultSyntax # :nodoc:
       def create_default(name, *args, &block)
-        set_factory_default(
-          name,
-          TestProf::FactoryBot.create(name, *args, &block)
-        )
+        options = args.extract_options!
+        preserve = options.delete(:preserve_traits)
+
+        obj = TestProf::FactoryBot.create(name, *args, options, &block)
+        set_factory_default(name, obj, preserve_traits: preserve)
       end
 
-      def set_factory_default(name, obj)
-        FactoryDefault.register(name, obj)
+      def set_factory_default(name, obj, preserve_traits: nil)
+        FactoryDefault.register(name, obj, preserve_traits: preserve_traits)
       end
     end
 
     class << self
+      attr_accessor :preserve_traits
+
       def init
         TestProf::FactoryBot::Syntax::Methods.include DefaultSyntax
         TestProf::FactoryBot.extend DefaultSyntax
@@ -29,18 +32,24 @@ module TestProf
         TestProf::FactoryBot::Strategy::Stub.prepend StrategyExt
 
         @store = {}
+        # default is false to retain backward compatibility
+        @preserve_traits = false
       end
 
-      def register(name, obj)
-        store[name] = obj
+      def register(name, obj, **options)
+        options[:preserve_traits] = true if FactoryDefault.preserve_traits
+        store[name] = { object: obj, **options }
+        obj
       end
 
-      def get(name)
-        store[name]
-      end
+      def get(name, traits = nil)
+        record = store[name]
+        return unless record
 
-      def exists?(name)
-        store.key?(name)
+        if traits && !traits.empty?
+          return if FactoryDefault.preserve_traits || record[:preserve_traits]
+        end
+        record[:object]
       end
 
       def remove(name)

data/lib/test_prof/factory_default/factory_bot_patch.rb

@@ -7,6 +7,10 @@ module TestProf
         def name
           @name
         end
+
+        def traits
+          @traits
+        end
       end
     end
 
@@ -14,8 +18,7 @@ module TestProf
 
     module StrategyExt
       def association(runner)
-        return super unless FactoryDefault.exists?(runner.name)
-        FactoryDefault.get(runner.name)
+        FactoryDefault.get(runner.name, runner.traits) || super
       end
     end
   end

data/lib/test_prof/ruby_prof/rspec.rb

@@ -1,13 +1,46 @@
 # frozen_string_literal: true
 
-# Shared example for RSpec to profile specific examples with RubyProf
-RSpec.shared_context "ruby-prof", rprof: true do
-  prepend_before do
-    @ruby_prof_report = TestProf::RubyProf.profile
+module TestProf
+  module RubyProf
+    # Reporter for RSpec to profile specific examples with RubyProf
+    class Listener # :nodoc:
+      NOTIFICATIONS = %i[
+        example_started
+        example_failed
+        example_passed
+      ].freeze
+
+      def example_started(notification)
+        return unless profile?(notification.example)
+        notification.example.metadata[:rprof_report] =
+          TestProf::RubyProf.profile
+      end
+
+      def example_finished(notification)
+        return unless profile?(notification.example)
+        notification.example.metadata[:rprof_report].dump(
+          notification.example.full_description.parameterize
+        )
+      end
+
+      alias example_passed example_finished
+      alias example_failed example_finished
+
+      private
+
+      def profile?(example)
+        example.metadata.key?(:rprof)
+      end
+    end
   end
+end
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    listener = TestProf::RubyProf::Listener.new
 
-  append_after do |ex|
-    next unless @ruby_prof_report
-    @ruby_prof_report.dump ex.full_description.parameterize
+    config.reporter.register_listener(
+      listener, *TestProf::RubyProf::Listener::NOTIFICATIONS
+    )
   end
 end

data/lib/test_prof/stack_prof.rb

@@ -29,8 +29,7 @@ module TestProf
       def initialize
         @mode = ENV.fetch('TEST_STACK_PROF_MODE', :wall).to_sym
         @target = ENV['TEST_STACK_PROF'] == 'boot' ? :boot : :suite
-        @raw = ENV['TEST_STACK_PROF'] == 'raw' || ENV['TEST_STACK_PROF_RAW'] == '1'
-        @raw = true if boot?
+        @raw = ENV['TEST_STACK_PROF_RAW'] != '0'
       end
 
       def raw?

data/lib/test_prof/stack_prof/rspec.rb

@@ -1,14 +1,45 @@
 # frozen_string_literal: true
 
-# Shared example for RSpec to profile specific examples with StackProf
-RSpec.shared_context "stackprof", sprof: true do
-  prepend_before do
-    @stack_prof_report = TestProf::StackProf.profile
+module TestProf
+  module StackProf
+    # Reporter for RSpec to profile specific examples with StackProf
+    class Listener # :nodoc:
+      NOTIFICATIONS = %i[
+        example_started
+        example_failed
+        example_passed
+      ].freeze
+
+      def example_started(notification)
+        TestProf::StackProf.profile if profile?(notification.example)
+      end
+
+      def example_finished(notification)
+        return unless profile?(notification.example)
+        TestProf::StackProf.dump(
+          notification.example.full_description.parameterize
+        )
+      end
+
+      alias example_passed example_finished
+      alias example_failed example_finished
+
+      private
+
+      def profile?(example)
+        example.metadata.key?(:sprof)
+      end
+    end
   end
+end
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    listener = TestProf::StackProf::Listener.new
 
-  append_after do |ex|
-    next unless @stack_prof_report
-    TestProf::StackProf.dump ex.full_description.parameterize
+    config.reporter.register_listener(
+      listener, *TestProf::StackProf::Listener::NOTIFICATIONS
+    )
   end
 end
 

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "0.6.0.pre1".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre1
+  version: 0.6.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6