Type is now always feature, which matches Capybara 2.0

jnicklas · Sep 9, 2012 · 1ac5f66 · 1ac5f66
1 parent 63139f0
commit 1ac5f66
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/lib/turnip.rb b/lib/turnip.rb
@@ -18,14 +18,8 @@ class Ambiguous < StandardError; end
   #
   module Steps
   end
-
-  class << self
-    attr_accessor :type
-  end
 end
 
-Turnip.type = :turnip
-
 Module.send(:include, Turnip::Define)
 
 self.extend Turnip::DSL

diff --git a/lib/turnip/builder.rb b/lib/turnip/builder.rb
@@ -40,7 +40,7 @@ def line
       end
 
       def metadata_hash
-        super.merge(:type => Turnip.type, :turnip => true)
+        super.merge(:type => :feature, :turnip => true)
       end
     end
 

diff --git a/lib/turnip/capybara.rb b/lib/turnip/capybara.rb
@@ -1,7 +1,5 @@
 require 'capybara/rspec'
 
-Turnip.type = :request
-
 RSpec.configure do |config|
   config.before do
     if self.class.include?(Capybara::DSL) and example.metadata[:turnip]