add Turnip::Define to all modules

jnicklas · Apr 24, 2012 · 464606e · 464606e
1 parent 9ca6c86
commit 464606e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/examples/steps/alignment_steps.rb b/examples/steps/alignment_steps.rb
@@ -1,6 +1,4 @@
 module Alignment
-  extend Turnip::Define
-
   attr_accessor :alignment
 
   step "that alignment should be :alignment" do |expected_alignment|

diff --git a/examples/steps/dragon_steps.rb b/examples/steps/dragon_steps.rb
@@ -1,8 +1,6 @@
 require_relative "knight_steps"
 
 module DragonSteps
-  extend Turnip::Define
-
   include KnightSteps
 
   attr_accessor :dragon
@@ -21,8 +19,6 @@ def dragon_attack
 end
 
 module RedDragonSteps
-  extend Turnip::Define
-
   include DragonSteps
 
   attr_accessor :red_dragon

diff --git a/examples/steps/knight_steps.rb b/examples/steps/knight_steps.rb
@@ -1,6 +1,4 @@
 module KnightSteps
-  extend Turnip::Define
-
   attr_accessor :knight
 
   class Knight

diff --git a/lib/turnip.rb b/lib/turnip.rb
@@ -17,7 +17,6 @@ class Ambiguous < StandardError; end
   # your tests.
   #
   module Steps
-    extend Define
   end
 
   class << self
@@ -36,6 +35,8 @@ def load_steps
 Turnip.type = :turnip
 Turnip.step_dirs = ['spec']
 
+Module.send(:include, Turnip::Define)
+
 self.extend Turnip::DSL
 
 require "turnip/rspec"
diff --git a/lib/turnip/dsl.rb b/lib/turnip/dsl.rb
@@ -15,7 +15,6 @@ def steps_for(tag, &block)
       else
         Module.new do
           singleton_class.send(:define_method, :tag) { tag }
-          extend Turnip::Define
           module_eval(&block)
           ::RSpec.configure { |c| c.include self, tag => true }
         end

diff --git a/spec/define_and_execute.rb b/spec/define_and_execute.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
-describe Turnip::Define do
-  let(:mod) { Module.new { extend Turnip::Define } }
+describe Turnip::Execute do
+  let(:mod) { Module.new }
   let(:obj) { Object.new.tap { |o| o.extend Turnip::Execute; o.extend mod } }
 
   it "defines a step method and makes it callable" do