rspec-core 2.13.1 → 2.14.0.rc1

data/lib/rspec/core/shared_example_group/collection.rb

@@ -0,0 +1,42 @@
+module RSpec
+  module Core
+    module SharedExampleGroup
+      class Collection
+
+        def initialize(sources, examples)
+          @sources, @examples = sources, examples
+        end
+
+        def [](key)
+          fetch_examples(key) || warn_deprecation_and_fetch_anyway(key)
+        end
+
+        private
+
+          def fetch_examples(key)
+            @examples[source_for key][key]
+          end
+
+          def source_for(key)
+            @sources.reverse.find { |source| @examples[source].has_key? key }
+          end
+
+          def fetch_anyway(key)
+            @examples.values.inject({}, &:merge)[key]
+          end
+
+          def warn_deprecation_and_fetch_anyway(key)
+            if (example = fetch_anyway key)
+              RSpec.warn_deprecation <<-WARNING.gsub(/^ /, '')
+                Accessing shared_examples defined across contexts is deprecated.
+                Please declare shared_examples within a shared context, or at the top level.
+                This message was generated at: #{caller(0)[8]}
+              WARNING
+              example
+            end
+          end
+
+      end
+    end
+  end
+end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.13.1'
+      STRING = '2.14.0.rc1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -4,13 +4,12 @@ module RSpec
 
       include RSpec::Core::Hooks
 
-      attr_reader :example_groups, :shared_example_groups, :filtered_examples
+      attr_reader :example_groups, :filtered_examples
       attr_accessor :wants_to_quit
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
         @example_groups = [].extend(Extensions::Ordered::ExampleGroups)
-        @shared_example_groups = {}
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
@@ -23,7 +22,7 @@ module RSpec
 
       def reset
         example_groups.clear
-        shared_example_groups.clear
+        SharedExampleGroup::Registry.clear
       end
 
       def filter_manager

data/spec/autotest/rspec_spec.rb

@@ -40,8 +40,8 @@ describe Autotest::Rspec2 do
       expect(actual_command).to match(expected_command)
 
       actual_command =~ expected_command
-      expect($1).to match /#{File.expand_path('file_one')}/
-      expect($1).to match /#{File.expand_path('file_two')}/
+      expect($1).to match(/#{File.expand_path('file_one')}/)
+      expect($1).to match(/#{File.expand_path('file_two')}/)
     end
 
     it "returns a blank command for no files" do

data/spec/rspec/core/backtrace_cleaner_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+
+module RSpec::Core
+  describe BacktraceCleaner do
+    context "with no patterns" do
+      it "keeps all lines" do
+        lines = ["/tmp/a_file", "some_random_text", "hello\330\271!"]
+        cleaner = BacktraceCleaner.new([], [])
+        expect(lines.all? {|line| cleaner.exclude? line}).to be_false
+      end
+
+      it 'is considered a full backtrace' do
+        expect(BacktraceCleaner.new([], []).full_backtrace?).to be_true
+      end
+    end
+
+    context "with an exclusion pattern but no inclusion patterns" do
+      it "excludes lines that match the exclusion pattern" do
+        cleaner = BacktraceCleaner.new([], [/remove/])
+        expect(cleaner.exclude? "remove me").to be_true
+      end
+
+      it "keeps lines that do not match the exclusion pattern" do
+        cleaner = BacktraceCleaner.new([], [/remove/])
+        expect(cleaner.exclude? "apple").to be_false
+      end
+
+      it 'is considered a partial backtrace' do
+        expect(BacktraceCleaner.new([], [/remove/]).full_backtrace?).to be_false
+      end
+    end
+
+    context "with an exclusion pattern and an inclusion pattern" do
+      it "excludes lines that match the exclusion pattern but not the inclusion pattern" do
+        cleaner = BacktraceCleaner.new([/keep/], [/discard/])
+        expect(cleaner.exclude? "discard").to be_true
+      end
+
+      it "keeps lines that match the inclusion pattern and the exclusion pattern" do
+        cleaner = BacktraceCleaner.new([/hi/], [/.*/])
+        expect(cleaner.exclude? "hi").to be_false
+      end
+
+      it "keeps lines that match neither pattern" do
+        cleaner = BacktraceCleaner.new([/hi/], [/delete/])
+        expect(cleaner.exclude? "fish").to be_false
+      end
+
+      it 'is considered a partial backtrace' do
+        expect(BacktraceCleaner.new([], [/remove/]).full_backtrace?).to be_false
+      end
+    end
+
+    context "with an exclusion pattern that matches the current working directory" do
+      it "defaults to having one inclusion pattern, the current working directory" do
+        cleaner = BacktraceCleaner.new(nil, [/.*/])
+        expect(Dir.getwd =~ cleaner.inclusion_patterns.first).to be_true
+      end
+    end
+
+    context "with an exclusion pattern that does not match the current working directory" do
+      it "defaults to having no exclusion patterns" do
+        cleaner = BacktraceCleaner.new(nil, [/i_wont_match_a_directory/])
+        expect(cleaner.inclusion_patterns.length).to be_zero
+      end
+    end
+  end
+end

data/spec/rspec/core/configuration_options_spec.rb

@@ -25,14 +25,14 @@ describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolat
       opts = config_options_object(*%w[--require a/path -I a/lib])
       config = double("config").as_null_object
       config.should_receive(:libs=).ordered
-      config.should_receive(:requires=).ordered
+      config.should_receive(:setup_load_path_and_require).ordered
       opts.configure(config)
     end
 
-    it "sends requires before formatter" do
+    it "sets up load path and requires before formatter" do
       opts = config_options_object(*%w[--require a/path -f a/formatter])
       config = double("config").as_null_object
-      config.should_receive(:requires=).ordered
+      config.should_receive(:setup_load_path_and_require).ordered
       config.should_receive(:add_formatter).ordered
       opts.configure(config)
     end
@@ -105,7 +105,8 @@ describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolat
       with_env_vars 'SPEC_OPTS' => "--require file_from_env" do
         opts = config_options_object(*%w[--require file_from_opts])
         config = RSpec::Core::Configuration.new
-        config.should_receive(:requires=).with(["file_from_opts", "file_from_env"])
+        config.should_receive(:require).with("file_from_opts")
+        config.should_receive(:require).with("file_from_env")
         opts.configure(config)
       end
     end
@@ -378,6 +379,16 @@ describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolat
       expect(parse_options[:formatters]).to eq([['local']])
     end
 
+    it "parses options file correctly if erb code has trimming options" do
+      File.open("./.rspec", "w") do |f|
+        f << "<% if true -%>\n"
+        f << "--format local\n"
+        f << "<%- end %>\n"
+      end
+
+      expect(parse_options[:formatters]).to eq([['local']])
+    end
+
     context "with custom options file" do
       it "ignores project and global options files" do
         File.open("./.rspec", "w") {|f| f << "--format project"}

data/spec/rspec/core/configuration_spec.rb

@@ -16,8 +16,59 @@ module RSpec::Core
       end
     end
 
-    describe "#load_spec_files" do
+    describe '#deprecation_stream' do
+      it 'defaults to standard error' do
+        expect(config.deprecation_stream).to eq $stderr
+      end
+
+      it 'is configurable' do
+        io = double 'deprecation io'
+        config.deprecation_stream = io
+        expect(config.deprecation_stream).to eq io
+      end
+    end
+
+    describe "#setup_load_path_and_require" do
+      include_context "isolate load path mutation"
+
+      def absolute_path_to(dir)
+        File.expand_path("../../../../#{dir}", __FILE__)
+      end
+
+      it 'adds `lib` to the load path' do
+        lib_dir = absolute_path_to("lib")
+        $LOAD_PATH.delete(lib_dir)
+
+        expect($LOAD_PATH).not_to include(lib_dir)
+        config.setup_load_path_and_require []
+        expect($LOAD_PATH).to include(lib_dir)
+      end
 
+      it 'adds the configured `default_path` to the load path' do
+        config.default_path = 'features'
+        foo_dir = absolute_path_to("features")
+
+        expect($LOAD_PATH).not_to include(foo_dir)
+        config.setup_load_path_and_require []
+        expect($LOAD_PATH).to include(foo_dir)
+      end
+
+      it 'stores the required files' do
+        config.should_receive(:require).with('a/path')
+        config.setup_load_path_and_require ['a/path']
+        expect(config.requires).to eq ['a/path']
+      end
+
+      context "when `default_path` refers to a file rather than a directory" do
+        it 'does not add it to the load path' do
+          config.default_path = 'Rakefile'
+          config.setup_load_path_and_require []
+          expect($LOAD_PATH).not_to include(match(/Rakefile/))
+        end
+      end
+    end
+
+    describe "#load_spec_files" do
       it "loads files using load" do
         config.files_to_run = ["foo.bar", "blah_spec.rb"]
         config.should_receive(:load).twice
@@ -354,7 +405,7 @@ module RSpec::Core
           %w[ a/2.rb a/1.rb a/3.rb ],
           %w[ a/3.rb a/2.rb a/1.rb ]
         ].map do |files|
-          Dir.should_receive(:[]).with(/^a/) { files }
+          Dir.should_receive(:[]).with(/^\{?a/) { files }
           yield
           config.files_to_run
         end
@@ -435,6 +486,14 @@ module RSpec::Core
             expect(config.files_to_run).to include("#{dir}/a_foo.rb")
             expect(config.files_to_run).to include("#{dir}/a_bar.rb")
           end
+
+          it "supports curly braces glob syntax" do
+            config.send(setter, "**/*_{foo,bar}.rb")
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            config.files_or_directories_to_run = dir
+            expect(config.files_to_run).to include("#{dir}/a_foo.rb")
+            expect(config.files_to_run).to include("#{dir}/a_bar.rb")
+          end
         end
       end
     end
@@ -446,16 +505,26 @@ module RSpec::Core
       end
     end
 
-    context "with full_description" do
+    context "with full_description set" do
       it "overrides filters" do
         config.filter_run :focused => true
         config.full_description = "foo"
         expect(config.filter).not_to have_key(:focused)
       end
+
+      it 'is possible to access the full description regular expression' do
+        config.full_description = "foo"
+        expect(config.full_description).to eq(/foo/)
+      end
     end
 
-    context "with line number" do
+    context "without full_description having been set" do
+      it 'returns nil from #full_description' do
+        expect(config.full_description).to eq nil
+      end
+    end
 
+    context "with line number" do
       it "assigns the file and line number as a location filter" do
         config.files_or_directories_to_run = "path/to/a_spec.rb:37"
         expect(config.filter).to eq({:locations => {File.expand_path("path/to/a_spec.rb") => [37]}})
@@ -490,6 +559,11 @@ module RSpec::Core
       expect(config.filter).to eq({:full_description => Regexp.union(/foo/, /bar/)})
     end
 
+    it 'is possible to access the full description regular expression' do
+      config.full_description = "foo","bar"
+      expect(config.full_description).to eq Regexp.union(/foo/,/bar/)
+    end
+
     describe "#default_path" do
       it 'defaults to "spec"' do
         expect(config.default_path).to eq('spec')
@@ -907,18 +981,29 @@ module RSpec::Core
       end
     end
 
+    describe "line_numbers" do
+      it "returns the line numbers from the filter" do
+        config.line_numbers = ['42']
+        expect(config.line_numbers).to eq [42]
+      end
+
+      it "defaults to empty" do
+        expect(config.line_numbers).to eq []
+      end
+    end
+
     describe "#full_backtrace=" do
       context "given true" do
-        it "clears the backtrace clean patterns" do
+        it "clears the backtrace exclusion patterns" do
           config.full_backtrace = true
-          expect(config.backtrace_clean_patterns).to eq([])
+          expect(config.backtrace_exclusion_patterns).to eq([])
         end
       end
 
       context "given false" do
         it "restores backtrace clean patterns" do
           config.full_backtrace = false
-          expect(config.backtrace_clean_patterns).to eq(RSpec::Core::Configuration::DEFAULT_BACKTRACE_PATTERNS)
+          expect(config.backtrace_exclusion_patterns).to eq(RSpec::Core::BacktraceCleaner::DEFAULT_EXCLUSION_PATTERNS)
         end
       end
 
@@ -927,29 +1012,69 @@ module RSpec::Core
         config_2 = Configuration.new
 
         config_1.full_backtrace = true
-        expect(config_2.backtrace_clean_patterns).not_to be_empty
+        expect(config_2.backtrace_exclusion_patterns).not_to be_empty
+      end
+    end
+
+    describe "#backtrace_clean_patterns=" do
+      it "actually receives the new filter values" do
+        RSpec.stub(:deprecate)
+        config = Configuration.new
+        config.backtrace_clean_patterns = [/.*/]
+        expect(config.backtrace_cleaner.exclude? "this").to be_true
       end
     end
 
-    describe "#cleaned_from_backtrace? defaults" do
+    describe 'full_backtrace' do
+      it 'returns true when backtrace patterns is empty' do
+        config.backtrace_exclusion_patterns = []
+        expect(config.full_backtrace?).to eq true
+      end
+
+      it 'returns false when backtrace patterns isnt empty' do
+        config.backtrace_exclusion_patterns = [:lib]
+        expect(config.full_backtrace?).to eq false
+      end
+    end
+
+    describe "#backtrace_clean_patterns" do
+      before { allow(RSpec).to receive(:deprecate) }
+      it "is deprecated" do
+        RSpec.should_receive(:deprecate)
+        config = Configuration.new
+        config.backtrace_clean_patterns
+      end
+
+      it "can be appended to" do
+        config = Configuration.new
+        config.backtrace_clean_patterns << /.*/
+        expect(config.backtrace_cleaner.exclude? "this").to be_true
+      end
+    end
+
+    describe ".backtrace_cleaner#exclude? defaults" do
       it "returns true for rspec files" do
-        expect(config.cleaned_from_backtrace?("lib/rspec/core.rb")).to be_true
+        expect(config.backtrace_cleaner.exclude?("lib/rspec/core.rb")).to be_true
       end
 
       it "returns true for spec_helper" do
-        expect(config.cleaned_from_backtrace?("spec/spec_helper.rb")).to be_true
+        expect(config.backtrace_cleaner.exclude?("spec/spec_helper.rb")).to be_true
       end
 
       it "returns true for java files (for JRuby)" do
-        expect(config.cleaned_from_backtrace?("org/jruby/RubyArray.java:2336")).to be_true
+        expect(config.backtrace_cleaner.exclude?("org/jruby/RubyArray.java:2336")).to be_true
       end
 
       it "returns true for files within installed gems" do
-        expect(config.cleaned_from_backtrace?('ruby-1.8.7-p334/gems/mygem-2.3.0/lib/mygem.rb')).to be_true
+        expect(config.backtrace_cleaner.exclude?('ruby-1.8.7-p334/gems/mygem-2.3.0/lib/mygem.rb')).to be_true
       end
 
       it "returns false for files in projects containing 'gems' in the name" do
-        expect(config.cleaned_from_backtrace?('code/my-gems-plugin/lib/plugin.rb')).to be_false
+        expect(config.backtrace_cleaner.exclude?('code/my-gems-plugin/lib/plugin.rb')).to be_false
+      end
+
+      it "returns false for something in the current working directory" do
+        expect(config.backtrace_cleaner.exclude?("#{Dir.getwd}/arbitrary")).to be_false
       end
     end
 
@@ -961,6 +1086,7 @@ module RSpec::Core
         else
           @orig_debugger = nil
         end
+        config.stub(:require)
         Object.const_set("Debugger", debugger)
       end
 
@@ -977,10 +1103,14 @@ module RSpec::Core
       end
 
       it "starts the debugger" do
-        config.stub(:require)
         debugger.should_receive(:start)
         config.debug = true
       end
+
+      it 'sets the reader to true' do
+        config.debug = true
+        expect(config.debug?).to eq true
+      end
     end
 
     describe "#debug=false" do
@@ -988,6 +1118,11 @@ module RSpec::Core
         config.should_not_receive(:require).with('ruby-debug')
         config.debug = false
       end
+
+      it 'sets the reader to false' do
+        config.debug = false
+        expect(config.debug?).to eq false
+      end
     end
 
     describe "#output=" do
@@ -999,16 +1134,36 @@ module RSpec::Core
     end
 
     describe "#libs=" do
+      include_context "isolate load path mutation"
+
       it "adds directories to the LOAD_PATH" do
         $LOAD_PATH.should_receive(:unshift).with("a/dir")
         config.libs = ["a/dir"]
       end
     end
 
+    describe "libs" do
+      include_context "isolate load path mutation"
+
+      it 'records paths added to the load path' do
+        config.libs = ["a/dir"]
+        expect(config.libs).to eq ["a/dir"]
+      end
+    end
+
     describe "#requires=" do
-      it "requires paths" do
+      before { RSpec.should_receive :deprecate }
+
+      it "requires the configured files" do
+        config.should_receive(:require).with('foo').ordered
+        config.should_receive(:require).with('bar').ordered
+        config.requires = ['foo', 'bar']
+      end
+
+      it "stores require paths" do
         config.should_receive(:require).with("a/path")
         config.requires = ["a/path"]
+        expect(config.requires).to eq ['a/path']
       end
     end
 
@@ -1065,7 +1220,7 @@ module RSpec::Core
 
       context "with :alias => " do
         it "is deprecated" do
-          RSpec::should_receive(:warn).with(/deprecated/)
+          RSpec::should_receive(:deprecate).with(/:alias option/, :replacement => ":alias_with")
           config.add_setting :custom_option
           config.add_setting :another_custom_option, :alias => :custom_option
         end
@@ -1317,7 +1472,7 @@ module RSpec::Core
       it 'sets a block that determines the ordering of a collection extended with Extensions::Ordered::Examples' do
         examples = [1, 2, 3, 4]
         examples.extend Extensions::Ordered::Examples
-        config.order_examples { |examples| examples.reverse }
+        config.order_examples { |examples_to_order| examples_to_order.reverse }
         expect(examples.ordered).to eq([4, 3, 2, 1])
       end
 
@@ -1339,7 +1494,7 @@ module RSpec::Core
       it 'sets a block that determines the ordering of a collection extended with Extensions::Ordered::ExampleGroups' do
         groups = [1, 2, 3, 4]
         groups.extend Extensions::Ordered::ExampleGroups
-        config.order_groups { |groups| groups.reverse }
+        config.order_groups { |groups_to_order| groups_to_order.reverse }
         expect(groups.ordered).to eq([4, 3, 2, 1])
       end
 
@@ -1372,5 +1527,33 @@ module RSpec::Core
         expect(groups.ordered).to eq([4, 3, 2, 1])
       end
     end
+
+    describe '#warnings' do
+      around do |example|
+        @_original_setting = $VERBOSE
+        example.run
+        $VERBOSE = @_original_setting
+      end
+
+      it "sets verbose to true when true" do
+        config.warnings = true
+        expect($VERBOSE).to eq true
+      end
+
+      it "sets verbose to false when true" do
+        config.warnings = false
+        expect($VERBOSE).to eq false
+      end
+
+      it 'returns the verbosity setting' do
+        expect(config.warnings).to eq $VERBOSE
+      end
+
+      it 'is loaded from config by #force' do
+        config.force :warnings => true
+        expect($VERBOSE).to eq true
+      end
+    end
+
   end
 end