Merge pull request #61 from gongo/support_rspec-core-340

Support RSpec 3.4
gongo · Dec 16, 2015 · a8efefa · a8efefa
2 parents 7918229 + 0f10e4c
commit a8efefa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/lib/turnip_formatter/step_template/source.rb b/lib/turnip_formatter/step_template/source.rb
@@ -1,5 +1,4 @@
 require 'turnip_formatter/step_template/base'
-require 'rspec/core/formatters/snippet_extractor'
 
 module TurnipFormatter
   module StepTemplate
@@ -38,13 +37,21 @@ def build(example)
 
       private
 
-        def location(example)
-          formatted_backtrace(example).first
-        end
+      def location(example)
+        formatted_backtrace(example).first
+      end
 
-        def extractor
-          @extractor ||= ::RSpec::Core::Formatters::SnippetExtractor.new
-        end
+      def extractor
+        @extractor ||= begin
+                         # RSpec 3.4
+                         require 'rspec/core/formatters/html_snippet_extractor'
+                         ::RSpec::Core::Formatters::HtmlSnippetExtractor.new
+                       rescue LoadError
+                         # RSpec 3.3 or earlier
+                         require 'rspec/core/formatters/snippet_extractor'
+                         ::RSpec::Core::Formatters::SnippetExtractor.new
+                       end
+      end
     end
   end
 end
diff --git a/turnip_formatter.gemspec b/turnip_formatter.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'turnip', '~> 1.3.0'
   spec.add_dependency 'slim'
-  spec.add_dependency 'rspec', [">=3.0", "<3.4"]
+  spec.add_dependency 'rspec', [">=3.0", "<4.0"]
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'coveralls'