bbq 0.0.2 → 0.0.3

data/.gitignore

@@ -9,4 +9,6 @@ test/dummy/log/*.log
 test/dummy/tmp/
 test/dummy/test/acceptance/*
 test/dummy/spec/acceptance/*
+test/dope/test/acceptance/*
+test/dope/spec/acceptance/*
 nbproject/

data/CHANGELOG

@@ -0,0 +1,12 @@
+0.0.3
+
+* Added support and tests for Sinatra
+* Added Bbq.app and Bbq.app=
+
+0.0.2
+
+* ...
+
+0.0.1
+
+* ...

data/README.md

@@ -1,7 +1,7 @@
 Warning & disclaimer
 ====================
 
-This gem is currently under development. We're targeting most popular use case - Rails. However the philosophy behind it is not limited to Rails nor web applications in general. There is even example usage with EventMachine. Feel free to modify it for your own needs.
+This gem is currently under development. We're targeting most popular use cases - Rails & Rack applications (ex. Sinatra). However the philosophy behind it is not limited to Rails nor web applications in general. There is even example usage with EventMachine. Feel free to modify it for your own needs.
 
 [![Build Status](https://secure.travis-ci.org/drugpl/bbq.png)](http://travis-ci.org/drugpl/bbq)
 

data/Rakefile

@@ -22,7 +22,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = 'test/unit/*_test.rb' # Don't load test/dummy/test && test/dope/test etc. because we run them from our tests with proper commands setup.
   t.verbose = false
 end
 

data/bbq.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "devise",      "~> 1.4.0"
   s.add_development_dependency "rspec-rails", "~> 2.6.0"
 
+  s.add_development_dependency "sinatra",     "~> 1.2.6"
+
 end

data/lib/bbq.rb

@@ -1,7 +1,21 @@
-require 'bbq/railtie' if defined?(Rails)
+require 'pathname'
 
 module Bbq
   def self.root
     @root ||= Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
   end
+
+  def self.rails?
+    defined?(::Rails)
+  end
+
+  def self.app
+    Capybara.app
+  end
+
+  def self.app=(new_app)
+    Capybara.app=(new_app)
+  end
 end
+
+require 'bbq/railtie' if Bbq.rails?

data/lib/bbq/devise.rb

@@ -6,12 +6,12 @@ if defined?(Devise)
       attr_accessor :devise_authentication_key, :email, :password, :scope
 
       def initialize_devise
-        unless @devise_initialized
+        @devise_initialized ||= begin
           self.devise_authentication_key = ::Devise.authentication_keys.first
           self.email = options[devise_authentication_key.to_sym] || Bbq::Devise.next_email
           self.password = options[:password] || Bbq::Devise.next_password
           self.scope = ::Devise.mappings.first.second.singular.to_s
-          @devise_initialized = true
+          true
         end
       end
 

data/lib/bbq/test.rb

@@ -1,3 +1,4 @@
+require 'bbq'
 require 'active_support'
 require 'test/unit'
 require 'bbq/test_user'

data/lib/bbq/test_user.rb

@@ -1,14 +1,20 @@
-require 'capybara/rails'
+require 'capybara/rails' if Bbq.rails?
 require 'capybara/dsl'
 require 'securerandom'
 require 'bbq/util'
+require 'bbq/test_user/eyes'
+require 'bbq/test_user/within'
 
 module Bbq
   class TestUser
-    include ActionDispatch::Routing::UrlFor
-    include Rails.application.routes.url_helpers
-    include ActionDispatch::Routing::RouteSet::MountedHelpers unless Rails.version < "3.1"
+    if Bbq.rails?
+      include ActionDispatch::Routing::UrlFor
+      include Rails.application.routes.url_helpers
+      include ActionDispatch::Routing::RouteSet::MountedHelpers unless Rails.version < "3.1"
+    end
     include Capybara::DSL
+    include Bbq::TestUser::Eyes
+    include Bbq::TestUser::Within
 
     attr_reader :options
 
@@ -42,13 +48,5 @@ module Bbq
         self.extend(module_obj)
       end
     end
-
-    def see?(*args)
-      args.all? { |arg| has_content?(arg) }
-    end
-
-    def not_see?(*args)
-      args.all? { |arg| has_no_content?(arg) }
-    end
   end
 end

data/lib/bbq/test_user/eyes.rb

@@ -0,0 +1,13 @@
+module Bbq
+  class TestUser
+    module Eyes
+      def see?(*args)
+        args.all? { |arg| has_content?(arg) }
+      end
+
+      def not_see?(*args)
+        args.all? { |arg| has_no_content?(arg) }
+      end
+    end
+  end
+end

data/lib/bbq/test_user/within.rb

@@ -0,0 +1,31 @@
+module Bbq
+  class TestUser
+    module Within
+      METHODS_USING_WITHIN = [
+        :see?, :not_see?,
+        :attach_file, :check, :choose, :click_link_or_button, :click_button,
+        :click_link, :click_on, :fill_in, :select, :uncheck, :unselect
+      ]
+
+      METHODS_USING_WITHIN.each do |method_name|
+        class_eval <<-RUBY
+          def #{method_name}(*args)
+            using_within(args) { super }
+          end
+        RUBY
+      end
+
+      def using_within(args)
+        options = args.extract_options!
+        locator = options.delete(:within)
+        args.push(options) unless options.empty?
+
+        if locator
+          within(locator) { yield }
+        else
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/bbq/version.rb

@@ -1,3 +1,3 @@
 module Bbq
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dope/app.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../Gemfile', __FILE__)
+
+raise 'could not find gemfile' unless File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] = gemfile
+require 'bundler'
+Bundler.setup
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)
+
+require 'sinatra'
+
+module Dope
+  class App < ::Sinatra::Base
+    get "/" do
+      "BBQ supports sinatra"
+    end
+  end
+end

data/test/dummy/app/controllers/home_controller.rb

@@ -8,4 +8,7 @@ class HomeController < ApplicationController
   def miracle
     render :text => "MIRACLE"
   end
+
+  def ponycorns
+  end
 end

data/test/dummy/app/views/home/ponycorns.html.erb

@@ -0,0 +1,13 @@
+<ul id="unicorns">
+  <li>Pink</li>
+</ul>
+
+<ul id="ponies">
+  <li>Violet</li>
+</ul>
+
+<div id="new_pony">
+  <input type="text" name="color" value="" />
+</div>
+
+<a href="#">More ponycorns</a>

data/test/dummy/config/routes.rb

@@ -3,4 +3,5 @@ Dummy::Application.routes.draw do
   root :to => "home#index"
 
   match "/miracle" => "home#miracle"
+  match "/ponycorns" => "home#ponycorns"
 end

data/test/unit/bbq_test_unit_test.rb

@@ -3,6 +3,34 @@ require 'test_helper'
 class BbqTestUnitTest < Test::Unit::TestCase
   include CommandHelper
 
+  def test_sinatra
+    create_file 'test/dope/test/acceptance/root_path_test.rb', <<-TESTCASE
+      require 'app'
+      require 'bbq/test'
+
+      class DopeAppRootTest < Bbq::TestCase
+        FAILED_ASSERTION = RUBY_VERSION < "1.9" ? Test::Unit::AssertionFailedError : MiniTest::Assertion
+
+        background do
+          Bbq.app = ::Dope::App
+        end
+
+        scenario "user see '/' page" do
+          user = Bbq::TestUser.new
+          user.visit "/"
+          user.see!("BBQ supports sinatra")
+          assert user.see?("BBQ supports sinatra")
+
+          assert_raises(FAILED_ASSERTION) { user.see!("blah") }
+          assert_raises(FAILED_ASSERTION) { user.not_see!("BBQ supports sinatra") }
+        end
+      end
+    TESTCASE
+
+    run_cmd 'ruby -Itest/dope -Itest/dope/test test/dope/test/acceptance/root_path_test.rb'
+    assert_match /1 tests, 3 assertions, 0 failures, 0 errors/, output
+  end
+
   def test_dsl
     create_file 'test/dummy/test/acceptance/dsl_test.rb', <<-TESTCASE
       require 'test_helper'

data/test/unit/bbq_test_user_test.rb

@@ -51,4 +51,24 @@ class BbqTestUserTest < Test::Unit::TestCase
     assert @user.see?("MIRACLE")
   end
 
+  def test_user_eyes_within_scope
+    @user = TestUser.new
+    @user.visit "/ponycorns"
+    assert @user.see?("Pink", :within => "#unicorns")
+    assert ! @user.see?("Violet", :within => "#unicorns")
+    assert @user.not_see?("Violet", :within => "#unicorns")
+    assert ! @user.not_see?("Pink", :within => "#unicorns")
+
+    assert_nothing_raised do
+      @user.fill_in "color", :with => "red", :within => "#new_pony"
+    end
+    assert_raises Capybara::ElementNotFound do
+      @user.fill_in "color", :with => "red", :within => "#new_unicorn"
+    end
+
+    assert_nothing_raised do
+      @user.click_link "More ponycorns"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000 +02:00
+date: 2011-07-14 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &14361700 !ruby/object:Gem::Requirement
+  requirement: &6718740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14361700
+  version_requirements: *6718740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14361160 !ruby/object:Gem::Requirement
+  requirement: &6717800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14361160
+  version_requirements: *6717800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14360560 !ruby/object:Gem::Requirement
+  requirement: &6716860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *14360560
+  version_requirements: *6716860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14360060 !ruby/object:Gem::Requirement
+  requirement: &6715100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *14360060
+  version_requirements: *6715100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &14359600 !ruby/object:Gem::Requirement
+  requirement: &6712180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *14359600
+  version_requirements: *6712180
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &14359020 !ruby/object:Gem::Requirement
+  requirement: &6707800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *14359020
+  version_requirements: *6707800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &14358560 !ruby/object:Gem::Requirement
+  requirement: &6706580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,18 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *14358560
+  version_requirements: *6706580
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &6705280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.6
+  type: :development
+  prerelease: false
+  version_requirements: *6705280
 description: Objected oriented acceptance testing for Rails, using personas.
 email:
 - bbq@drug.org.pl
@@ -98,6 +109,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -109,6 +121,8 @@ files:
 - lib/bbq/rspec.rb
 - lib/bbq/test.rb
 - lib/bbq/test_user.rb
+- lib/bbq/test_user/eyes.rb
+- lib/bbq/test_user/within.rb
 - lib/bbq/util.rb
 - lib/bbq/version.rb
 - lib/generators/bbq/install_generator.rb
@@ -124,11 +138,13 @@ files:
 - lib/generators/test_unit/templates/bbq_test_case.rb
 - lib/generators/test_unit/templates/test_user.rb
 - lib/tasks/bbq.rake
+- test/dope/app.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/user.rb
+- test/dummy/app/views/home/ponycorns.html.erb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -179,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2429979834433993951
+      hash: -2949951085360793970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2429979834433993951
+      hash: -2949951085360793970
 requirements: []
 rubyforge_project: bbq
 rubygems_version: 1.6.2