diff --git a/lib/rspec/rails/fixture_support.rb b/lib/rspec/rails/fixture_support.rb index f3dbf399a5..97c2c28552 100644 --- a/lib/rspec/rails/fixture_support.rb +++ b/lib/rspec/rails/fixture_support.rb @@ -29,8 +29,7 @@ module FixtureSupport RSpec.configure do |c| c.include RSpec::Rails::FixtureSupport - c.add_setting :use_transactional_fixtures - c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures + c.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples c.add_setting :use_instantiated_fixtures c.add_setting :global_fixtures c.add_setting :fixture_path diff --git a/lib/rspec/rails/view_rendering.rb b/lib/rspec/rails/view_rendering.rb index db3d985533..4d26761466 100644 --- a/lib/rspec/rails/view_rendering.rb +++ b/lib/rspec/rails/view_rendering.rb @@ -1,16 +1,24 @@ require 'action_view/testing/resolvers' RSpec.configure do |config| - config.add_setting :render_views, :default => false + # This allows us to expose `render_views` as a config option even though it + # breaks the convention of other options by using `render_views` as a + # command (i.e. render_views = true), where it would normally be used as a + # getter. This makes it easier for rspec-rails users because we use + # `render_views` directly in example groups, so this aligns the two APIs, + # but requires this workaround: + config.add_setting :rendering_views, :default => false + + def config.render_views=(val) + self.rendering_views = val + end - # TODO - rspec-core needs a way to define a setting that works like this in - # one go def config.render_views - settings[:render_views] = true + self.rendering_views = true end def config.render_views? - settings[:render_views] + rendering_views end end