steak 1.0.0.rc.3 → 1.0.0.rc.4

data/Rakefile

@@ -8,6 +8,7 @@ task :default => :spec
 
 desc 'Run specs for the steak plugin.'
 RSpec::Core::RakeTask.new(:spec) do |t|
+  t.skip_bundler = true
   t.pattern = FileList["spec/**/*_spec.rb"]
 end
 

data/generators/acceptance_spec/templates/acceptance_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/acceptance_helper'
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
 
 feature "Feature name", %q{
   In order to ...

data/generators/steak/templates/acceptance_helper.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require "steak"
 <%- if options[:driver] == 'webrat' %>
 require "webrat"

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require "steak"
 <%- if driver == 'webrat' %>
 require "webrat"
@@ -13,7 +13,7 @@ module Steak::Webrat
   include Webrat::Matchers
   
   def app
-    Rails.application
+    ::Rails.application
   end
 end
 
@@ -22,7 +22,16 @@ RSpec.configuration.include Steak::Webrat, :type => :acceptance
 <%- else -%>
 require 'capybara/rails'
 
-RSpec.configuration.include Capybara, :type => :acceptance
+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

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/<%= @relative_path %>acceptance_helper'
+require File.expand_path(File.dirname(__FILE__) + '/<%= @relative_path %>acceptance_helper')
 
 feature "<%= @feature_name %>", %q{
   In order to ...

data/lib/steak.rb

@@ -4,7 +4,7 @@ rescue LoadError
   require 'spec'       
 end
 
-if defined?(RSpec)
+if defined?(RSpec::Core)
   require 'rspec-2/steak'
 else
   require 'rspec-1/steak'

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

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rspec'
 require File.dirname(__FILE__) + "/../../../lib/steak"
 require 'tempfile'
+require 'shellwords'
 
 module RSpec_1
   module Factories
@@ -44,7 +45,7 @@ module RSpec_1
   module HelperMethods
     def run(cmd)
       puts cmd if trace?
-      `rvm 1.8.7@steak-rspec-1 exec #{cmd} 2>&1`.tap do |o| 
+      `rvm @steak-rspec-1 exec #{cmd} 2>&1`.tap do |o| 
         puts o if trace? and o
       end
     end
@@ -69,7 +70,8 @@ module RSpec_1
   def self.gemset_create(gemset, *gems)
     `rvm gemset create #{gemset}`
     gems.each do |name|
-      `rvm #{gemset} gem search #{name} -i || rvm #{gemset} gem install #{name}`
+      name = Shellwords.escape(name)
+      `rvm @#{gemset} gem search #{name} -i || rvm @#{gemset} gem install #{name}`
     end
   end
 
@@ -77,12 +79,13 @@ module RSpec_1
     config.include Factories,     :example_group => { :file_path => /rspec-1/}
     config.include HelperMethods, :example_group => { :file_path => /rspec-1/}
     config.before :suite do
-      gemset_create "1.8.7@steak-rspec-1", "rspec-rails -v '~> 1.3.0'",
-                                           "rails -v '~> 2.3.8'",
-                                           "webrat",
-                                           "capybara",
-                                           "sqlite3-ruby",
-                                           "rake"
+      gemset_create "steak-rspec-1", "rspec-rails -v '~> 1'",
+                                     "rails -v '~> 2'",
+                                     "webrat",
+                                     "capybara",
+                                     "sqlite3-ruby",
+                                     "rake",
+                                     "test-unit -v '1.2.3'"
     end
   end
 end

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

@@ -28,7 +28,7 @@ feature "Steak generator for rails", %q{
 
     spec_file = create_spec :path    => rails_app + "/spec/acceptance",
                             :content => <<-SPEC
-      require File.dirname(__FILE__) + "/acceptance_helper.rb"
+      require File.expand_path(File.dirname(__FILE__) + "/acceptance_helper.rb")
       feature "Capybara spec" do
         scenario "First scenario" do
           visit "/"
@@ -49,7 +49,7 @@ feature "Steak generator for rails", %q{
 
     spec_file = create_spec :path    => rails_app + "/spec/acceptance",
                             :content => <<-SPEC
-      require File.dirname(__FILE__) + "/acceptance_helper.rb"
+      require File.expand_path(File.dirname(__FILE__) + "/acceptance_helper.rb")
       feature "Capybara spec" do
         scenario "First scenario" do
           visit "/"
@@ -75,7 +75,7 @@ feature "Steak generator for rails", %q{
 
     spec_file = create_spec :path    => rails_app + "/spec/acceptance",
                             :content => <<-SPEC
-      require File.dirname(__FILE__) + "/acceptance_helper.rb"
+      require File.expand_path(File.dirname(__FILE__) + "/acceptance_helper.rb")
       feature "Basic spec" do
         scenario "First scenario" do
           true.should == true

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

@@ -57,16 +57,10 @@ module RSpec_2
       end
     end
     
-    def run_spec(file_path, app_base=nil)
-      if app_base
-        current_dir = Dir.pwd
-        Dir.chdir app_base
+    def run_spec(file_path, app_base=Dir.pwd)
+      Dir.chdir app_base do
+        run("rspec #{file_path}")
       end
-
-      output = run("rspec #{file_path}")
-
-      Dir.chdir current_dir if app_base
-      output
     end
   end
 

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

@@ -13,7 +13,6 @@ feature "Acceptance spec execution", %q{
       require File.dirname(__FILE__) + "/acceptance_helper.rb"
       feature "Minimal spec" do
         scenario "First scenario" do
-          # Rails.env.should_not be_nil
           ::Rails.env.should == "test"
         end
       end
@@ -30,12 +29,12 @@ feature "Acceptance spec execution", %q{
       feature "Minimal spec" do
         scenario "First scenario" do
           get "/"
-          response.should contain(/No route matches/)
+          last_response.body.should =~ /Not Found/
         end
       end
     SPEC
     output = run_spec spec_file, File.join(File.dirname(spec_file), '../..')
-    output.should =~ /1 example, 1 failure/
+    output.should =~ /1 example, 0 failures/
   end
   
   scenario "Path helpers are available" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: steak
 version: !ruby/object:Gem::Version 
-  hash: 15424051
+  hash: 15424061
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 3
-  version: 1.0.0.rc.3
+  - 4
+  version: 1.0.0.rc.4
 platform: ruby
 authors: 
 - "Luismi Cavall\xC3\xA9"
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2010-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency