bbq 0.0.2.beta.1 → 0.0.2.beta.2

data/.travis.yml

@@ -3,6 +3,3 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
-  - jruby
-  - rbx
-  - rbx-2.0

data/lib/bbq/devise.rb

@@ -1,6 +1,5 @@
 if defined?(Devise)
-
-  require 'bbq/test'
+  require 'securerandom'
 
   module Bbq
     module Devise
@@ -42,11 +41,11 @@ if defined?(Devise)
       end
 
       def self.next_email
-        "#{ActiveSupport::SecureRandom.hex(3)}@example.com"
+        "#{SecureRandom.hex(3)}@example.com"
       end
 
       def self.next_password
-        ActiveSupport::SecureRandom.hex(8)
+        SecureRandom.hex(8)
       end
     end
   end

data/lib/bbq/railtie.rb

@@ -1,7 +1,15 @@
+require 'rails/generators'
+
 module Bbq
   class Railtie < Rails::Railtie
     rake_tasks do
       load Bbq.root.join("lib/tasks/bbq.rake")
     end
+
+    helper_generators = %w(test_unit rspec).collect do |test_framework|
+      ["#{test_framework}:bbq_test", "#{test_framework}:bbq_install"]
+    end.flatten
+
+    Rails::Generators.hide_namespaces *helper_generators
   end
 end

data/lib/bbq/rspec.rb

@@ -12,20 +12,6 @@ module Bbq
     end
   end
 
-  class TestUser
-    def see!(*args)
-      args.each do |arg|
-        page.should have_content(arg)
-      end
-    end
-
-    def not_see!(*args)
-      args.each do |arg|
-        page.should have_no_content(arg)
-      end
-    end
-  end
-
   module RSpecMatchers
     class TestUserEyes
       def initialize(negative, *args)
@@ -67,6 +53,24 @@ module Bbq
       TestUserEyes.new(true, *args)
     end
   end
+
+  class TestUser
+    include RSpec::Matchers
+    include Capybara::RSpecMatchers
+    include Bbq::RSpecMatchers
+
+    def see!(*args)
+      args.each do |arg|
+        page.should have_content(arg)
+      end
+    end
+
+    def not_see!(*args)
+      args.each do |arg|
+        page.should have_no_content(arg)
+      end
+    end
+  end
 end
 
 def self.feature(*args, &block)

data/lib/bbq/test_user.rb

@@ -1,5 +1,6 @@
 require 'capybara/rails'
 require 'capybara/dsl'
+require 'securerandom'
 require 'bbq/util'
 
 module Bbq
@@ -27,13 +28,21 @@ module Bbq
     end
 
     def page
-      Capybara.using_session(session_name) do
-        Capybara.current_session
+      Capybara.using_driver(current_driver) do
+        Capybara.using_session(session_name) do
+          Capybara.current_session
+        end
       end
     end
 
+    # Discuss: Shall we freeze ?
     def session_name
-      @session_name ||= ActiveSupport::SecureRandom.hex(8)
+      @session_name ||= SecureRandom.hex(8)
+    end
+
+    # Discuss: Shall we freeze ?
+    def current_driver
+      @current_driver
     end
 
     def roles(*names)

data/lib/bbq/version.rb

@@ -1,3 +1,3 @@
 module Bbq
-  VERSION = "0.0.2.beta.1"
+  VERSION = "0.0.2.beta.2"
 end

data/test/test_helper.rb

@@ -1,9 +1,6 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require 'test/unit'
-FAILED_ASSERTION = RUBY_VERSION < "1.9" ? Test::Unit::AssertionFailedError : MiniTest::Assertion
-
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rails/generators/test_case"

data/test/unit/bbq_rspec_test.rb

@@ -60,4 +60,26 @@ class BbqRspecTest < Test::Unit::TestCase
     run_cmd 'rspec -Itest/dummy/spec test/dummy/spec/acceptance/bbq_matchers_spec.rb'
     assert_match /1 example, 0 failures/, output
   end
+
+  def test_implicit_user_eyes
+    create_file 'test/dummy/spec/acceptance/implicit_user_eyes_spec.rb', <<-RSPEC
+      require 'spec_helper'
+      require 'bbq/rspec'
+
+      feature 'implicit user eyes' do
+        scenario 'should see welcome text' do
+          user = Bbq::TestUser.new
+          user.visit "/miracle"
+          user.see!("MIRACLE")
+          user.not_see!("BBQ")
+
+          lambda { user.see!("BBQ") }.should raise_error
+          lambda { user.not_see!("MIRACLE") }.should raise_error
+        end
+      end
+    RSPEC
+
+    run_cmd 'rspec -Itest/dummy/spec test/dummy/spec/acceptance/implicit_user_eyes_spec.rb'
+    assert_match /1 example, 0 failures/, output
+  end
 end

data/test/unit/bbq_test_unit_test.rb

@@ -28,4 +28,28 @@ class BbqTestUnitTest < Test::Unit::TestCase
     run_cmd 'ruby -Ilib -Itest/dummy/test test/dummy/test/acceptance/dsl_test.rb'
     assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, output
   end
+
+  def test_implicit_user_eyes
+    create_file 'test/dummy/test/acceptance/implicit_user_eyes_test.rb', <<-TESTUNIT
+      require 'test_helper'
+      require 'bbq/test'
+
+      FAILED_ASSERTION = RUBY_VERSION < "1.9" ? Test::Unit::AssertionFailedError : MiniTest::Assertion
+
+      class ImplicitUserEyesTest < Bbq::TestCase
+        scenario 'should see welcome text' do
+          user = Bbq::TestUser.new
+          user.visit "/miracle"
+          user.see!("MIRACLE")
+          user.not_see!("BBQ")
+
+          assert_raises(FAILED_ASSERTION) { user.see!("BBQ") }
+          assert_raises(FAILED_ASSERTION) { user.not_see!("MIRACLE") }
+        end
+      end
+    TESTUNIT
+
+    run_cmd 'ruby -Ilib -Itest/dummy/test test/dummy/test/acceptance/implicit_user_eyes_test.rb'
+    assert_match /1 tests, 2 assertions, 0 failures, 0 errors/, output
+  end
 end

data/test/unit/bbq_test_user_test.rb

@@ -27,6 +27,11 @@ class BbqTestUserTest < Test::Unit::TestCase
     end
   end
 
+  def test_driver_option
+    user = TestUser.new(:driver => :selenium)
+    assert_equal :selenium, user.page.mode
+  end
+
   def test_roles
     user = TestUser.new
     %w(comment upload moderate).each { |m| assert !user.respond_to?(m) }
@@ -39,13 +44,6 @@ class BbqTestUserTest < Test::Unit::TestCase
     %w(comment upload moderate).each { |m| assert user.respond_to?(m) }
   end
 
-  def test_implicit_user_eyes
-    @user = TestUser.new
-    @user.visit "/miracle"
-    assert_raises(FAILED_ASSERTION) { @user.see!("BBQ") }
-    assert_raises(FAILED_ASSERTION) { @user.not_see!("MIRACLE") }
-  end
-
   def test_explicit_user_eyes
     @user = TestUser.new
     @user.visit "/miracle"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbq
 version: !ruby/object:Gem::Version
-  version: 0.0.2.beta.1
+  version: 0.0.2.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-30 00:00:00.000000000 +02:00
+date: 2011-07-01 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &20161160 !ruby/object:Gem::Requirement
+  requirement: &10809360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *20161160
+  version_requirements: *10809360
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20160620 !ruby/object:Gem::Requirement
+  requirement: &10804540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *20160620
+  version_requirements: *10804540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20160160 !ruby/object:Gem::Requirement
+  requirement: &10799420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *20160160
+  version_requirements: *10799420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20159700 !ruby/object:Gem::Requirement
+  requirement: &10795560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *20159700
+  version_requirements: *10795560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20159240 !ruby/object:Gem::Requirement
+  requirement: &10793120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *20159240
+  version_requirements: *10793120
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &20158780 !ruby/object:Gem::Requirement
+  requirement: &10786860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *20158780
+  version_requirements: *10786860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20158320 !ruby/object:Gem::Requirement
+  requirement: &10776400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *20158320
+  version_requirements: *10776400
 description: Objected oriented acceptance testing for Rails, using personas.
 email:
 - bbq@drug.org.pl
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1992066288343406768
+      hash: -1304765227938922148
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: