steak 1.0.1 → 1.1.0

data/README.rdoc

@@ -101,10 +101,12 @@ You run your acceptance specs just like your regular specs. Individually...
 
 === In Rails 2.x
 
-Assuming you have already setup rspec-rails, add this to your project's
+You need to setup rspec-rails before installing Steak. Make sure you use rspec(-rails) 1.x versions and not 2.x which don't work with Rails 2.3. You may want to use bundler and/or rvm to make sure the right versions of the gems are used.
+
+Assuming you have already setup rspec-rails 1.x, add this to your project's
 <tt>config/environments/test.rb</tt>:
 
-  config.gem "steak", :version => ">= 1.0.0.rc.1", :lib => false
+  config.gem "steak", :lib => false
 
 Install the gem from the command line:
 
@@ -185,5 +187,7 @@ Steak was created by Luismi Cavallé and improved thanks to the love from:
 - Enable Interactive
 - Vojto Rinik
 - Fred Wu
+- Sergio Espeja
+- Joao Carlos
 
 Copyright (c) 2009, 2010 Luismi Cavallé, released under the MIT license

data/generators/steak/templates/steak.rake

@@ -1,6 +1,31 @@
 unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
 
-require 'spec/rake/spectask'
+begin
+  require 'spec/rake/spectask'
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.join(File.dirname(__FILE__),"..","..","config","environment"))
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
+  end
+end
 
 namespace :spec do
   desc "Run the code examples in spec/acceptance"

data/lib/rspec-2/rails/generators/install_generator.rb

@@ -2,9 +2,6 @@ require 'rails/generators'
 
 module Steak
   class InstallGenerator < Rails::Generators::Base
-    class_option :webrat, :desc => 'Use Webrat.', :type => :boolean
-    class_option :capybara, :desc => 'Use Capybara.', :type => :boolean
-
     source_root File.join(File.dirname(__FILE__), 'templates')
 
     desc <<-DESC
@@ -30,9 +27,5 @@ DESC
       copy_file "helpers.rb",           "spec/acceptance/support/helpers.rb"
       copy_file "paths.rb",             "spec/acceptance/support/paths.rb"
     end
-
-    def driver
-      @driver = options.webrat? ? 'webrat' : 'capybara'
-    end
   end
 end

data/lib/rspec-2/rails/generators/spec_generator.rb

@@ -18,7 +18,10 @@ Example:
 DESC
 
     def manifest
-      empty_directory File.join('spec/acceptance', class_path)
+      if behavior == :invoke
+        empty_directory File.join('spec/acceptance', class_path)
+      end
+
       file_name.gsub!(/_spec$/, "")
 
       @feature_name  = file_name.titleize

data/lib/rspec-2/rails/generators/templates/acceptance_helper.rb

@@ -1,38 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require "steak"
-<%- if driver == 'webrat' %>
-require "webrat"
-
-Webrat.configure do |config|
-  config.mode = :rack
-end
-
-module Steak::Webrat
-  include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-  
-  def app
-    ::Rails.application
-  end
-end
-
-RSpec.configuration.include Steak::Webrat, :type => :acceptance
-
-<%- else -%>
-require 'capybara/rails'
-
-module Steak::Capybara
-  include Rack::Test::Methods
-  include Capybara
-  
-  def app
-    ::Rails.application
-  end
-end
-
-RSpec.configuration.include Steak::Capybara, :type => :acceptance
-<%- end -%>
 
 # Put your acceptance spec helpers inside /spec/acceptance/support
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/lib/rspec-2/steak.rb

@@ -6,6 +6,12 @@ module Steak
       base.instance_eval do
         alias scenario example
         alias background before
+        
+        if defined?(RSpec::Rails)
+          include RSpec::Rails::RequestExampleGroup
+          include Rack::Test::Methods
+          metadata[:type] = :acceptance
+        end
       end
     end
   end

data/spec/acceptance/rspec-1/acceptance_helper.rb

@@ -66,7 +66,7 @@ module RSpec_1
       File.expand_path(File.dirname(__FILE__) + "/../../../")
     end
   end
-  
+ 
   def self.gemset_create(gemset, *gems)
     `rvm gemset create #{gemset}`
     gems.each do |name|

data/spec/acceptance/rspec-2/acceptance_helper.rb

@@ -15,20 +15,20 @@ module RSpec_2
     end
 
     def create_rails_app(options = {})
+      options[:browser_simulator] ||= "capybara"
+       
       path = File.join(Dir.tmpdir, String.random, "rails_app")
       FileUtils.rm_rf path
       run "rails new #{path}"
       FileUtils.rm_rf path + '/public/index.html'
       File.open(File.join(path, "Gemfile"), "a") do |file|
-        file.write "\ngem 'rspec-rails', '>= 2.0.0.a9'\n" <<
-                   "gem 'capybara'\n" <<
-                   "gem 'webrat'\n"
+        file.write %{
+          gem 'rspec-rails', '>= 2.0.0.a9'
+          gem '#{options[:browser_simulator]}'
+          gem 'steak', :path => '#{File.expand_path(File.dirname(__FILE__) + '/../../..')}'
+        }
       end
 
-      File.open(File.join(path, "Gemfile"), "a") do |file|
-        file.write "\ngem 'steak', :path => '#{File.expand_path(File.dirname(__FILE__) + '/../../..')}'\n"
-      end
-    
       run "bundle install"
 
       Dir.chdir path do

data/spec/acceptance/rspec-2/steak_install_generator_spec.rb

@@ -42,11 +42,7 @@ feature "Steak generator for rails", %q{
   end
 
   scenario "Running generator with webrat" do
-    rails_app = create_rails_app(:setup_steak => false, :scaffold => :users)
-
-    Dir.chdir rails_app do
-      run "rails generate steak:install --webrat"
-    end
+    rails_app = create_rails_app(:browser_simulator => :webrat, :scaffold => :users)
 
     spec_file = create_spec :path    => rails_app + "/spec/acceptance",
                             :content => <<-SPEC

data/spec/acceptance/rspec-2/steak_spec_generator_spec.rb

@@ -60,4 +60,18 @@ feature "Acceptance spec generator for rails", %q{
     File.exist?(file_path).should be_true
     File.read(file_path).should include("/../acceptance_helper")
   end
+
+  scenario "Removing an acceptance spec" do
+    Dir.chdir @rails_app do
+      run "rails generate steak:spec document_creation"
+      run "rails destroy steak:spec document_creation"
+    end
+
+    spec_dir = @rails_app + "/spec/acceptance/"
+    
+    File.exist?(spec_dir + "document_creation_spec.rb").should be_false
+    File.exist?(spec_dir + "acceptance_helper.rb").should be_true
+    File.exist?(spec_dir + "support/helpers.rb").should be_true
+    File.exist?(spec_dir + "support/paths.rb").should be_true
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steak
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Luismi Cavall\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +01:00
+date: 2011-01-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency