bbq 0.0.2.beta.2 → 0.0.2.beta.3

data/README.md

@@ -38,7 +38,7 @@ First, add BBQ to your apps Gemfile:
 
 ```ruby
 # Gemfile
-gem "bbq", :git => "git://github.com/drugpl/bbq.git"
+gem "bbq", "~> 0.0.2.beta.3"
 ```
 
 Run install generator:
@@ -108,7 +108,7 @@ After that TestUser have *login*, *logout*, *register*, *register_and_login* met
 test "user register with devise" do
   user = TestUser.new # or TestUser.new(:email => "email@example.com", :password => "secret")
   user.register_and_login
-  user.see?("Stuff after auth")
+  user.see!("Stuff after auth")
 end
 ```
 
@@ -117,7 +117,7 @@ Development environment
 
 ```
 bundle install
-bundle exec rake test
+bundle exec rake test:acceptance # or spec:acceptance for RSpec flavour
 ```
 
 Additional information

data/lib/bbq/devise.rb

@@ -3,37 +3,37 @@ if defined?(Devise)
 
   module Bbq
     module Devise
-
       attr_accessor :devise_authentication_key, :email, :password, :scope
 
-      def self.included(other)
-        other.add_callback(self)
-      end
-
-      def self.init(user)
-        user.devise_authentication_key = ::Devise.authentication_keys.first
-        user.email = user.options[user.devise_authentication_key.to_sym] || next_email
-        user.password = user.options[:password] || next_password
-        user.scope = ::Devise.mappings.first.second.singular.to_s
+      def initialize_devise
+        unless @devise_initialized
+          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
+        end
       end
 
       def register
-        visit send("new_#{self.scope}_registration_path")
-        fill_in "#{self.scope}_#{self.devise_authentication_key}", :with => @email
-        fill_in "#{self.scope}_password", :with => @password
-        fill_in "#{self.scope}_password_confirmation", :with => @password
+        initialize_devise
+        visit send("new_#{scope}_registration_path")
+        fill_in "#{scope}_#{devise_authentication_key}", :with => @email
+        fill_in "#{scope}_password", :with => @password
+        fill_in "#{scope}_password_confirmation", :with => @password
         find(:xpath, "//input[@name='commit']").click
       end
 
       def login
-        visit send("new_#{self.scope}_session_path")
-        fill_in "#{self.scope}_#{self.devise_authentication_key}", :with => @email
-        fill_in "#{self.scope}_password", :with => @password
+        initialize_devise
+        visit send("new_#{scope}_session_path")
+        fill_in "#{scope}_#{devise_authentication_key}", :with => @email
+        fill_in "#{scope}_password", :with => @password
         find(:xpath, "//input[@name='commit']").click
       end
 
       def logout
-        visit send("destroy_#{self.scope}_session_path")
+        visit send("destroy_#{scope}_session_path")
       end
 
       def register_and_login

data/lib/bbq/test.rb

@@ -4,7 +4,6 @@ require 'bbq/test_user'
 require 'test/unit/assertions'
 
 module Bbq
-
   class TestCase < ActiveSupport::TestCase
     class << self
       alias :scenario :test
@@ -16,7 +15,6 @@ module Bbq
 
   # test/unit specific methods for test_user
   class TestUser
-
     include Test::Unit::Assertions
 
     def see!(*args)
@@ -30,7 +28,5 @@ module Bbq
         assert has_no_content?(arg), "Found \"#{arg}\", which was unexpected."
       end
     end
-
   end
-
 end

data/lib/bbq/test_user.rb

@@ -4,27 +4,18 @@ require 'securerandom'
 require 'bbq/util'
 
 module Bbq
-
   class TestUser
-
     include ActionDispatch::Routing::UrlFor
     include Rails.application.routes.url_helpers
+    include ActionDispatch::Routing::RouteSet::MountedHelpers unless Rails.version < "3.1"
     include Capybara::DSL
 
     attr_reader :options
 
-    class << self
-      attr_accessor :callbacks
-    end
-
     def initialize(options = {})
       @session_name = options.delete(:session_name)
       @current_driver = options.delete(:driver)
       @options = options
-
-      self.class.callbacks && self.class.callbacks.each do |callback|
-        callback[:extension].send(callback[:method], self)
-      end
     end
 
     def page
@@ -52,11 +43,6 @@ module Bbq
       end
     end
 
-    def self.add_callback(extension, method=:init)
-      self.callbacks ||= []
-      self.callbacks << {:extension => extension, :method => method}
-    end
-
     def see?(*args)
       args.all? { |arg| has_content?(arg) }
     end
@@ -64,7 +50,5 @@ module Bbq
     def not_see?(*args)
       args.all? { |arg| has_no_content?(arg) }
     end
-
   end
-
 end

data/lib/bbq/version.rb

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

data/lib/generators/bbq/install_generator.rb

@@ -1,3 +1,5 @@
+require 'bbq'
+
 module Bbq
   class InstallGenerator < Rails::Generators::Base
     hook_for :test_framework, :aliases => "-t", :as => "bbq_install"

data/lib/generators/bbq/test_generator.rb

@@ -1,3 +1,5 @@
+require 'bbq'
+
 module Bbq
   class TestGenerator < Rails::Generators::NamedBase
     hook_for :test_framework, :aliases => "-t", :as => "bbq_test"

data/lib/generators/rspec/templates/test_user.rb

@@ -1,5 +1,3 @@
-require "spec_helper"
-
 class TestUser < Bbq::TestUser
   # FIXME: explain here how to extend TestUser
 end

data/lib/generators/test_unit/templates/README

@@ -3,3 +3,7 @@ To finish setup, place in your test/test_helper.rb the following:
 
   require 'bbq/test'
 
+Also make sure that you require there support files:
+
+  # Load support files
+  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/lib/generators/test_unit/templates/test_user.rb

@@ -1,5 +1,3 @@
-require "test_helper"
-
 class TestUser < Bbq::TestUser
   # FIXME: explain here how to extend TestUser
 end

data/lib/tasks/bbq.rake

@@ -2,14 +2,14 @@ require 'rake/testtask'
 
 Rake::TestTask.new("test:acceptance") do |t|
   t.libs << 'test'
-  t.pattern = 'test/acceptance/*_test.rb'
+  t.pattern = 'test/acceptance/**/*_test.rb'
   t.verbose = false
 end if File.exists?('test/acceptance')
 
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new('spec:acceptance') do |spec|
-    spec.pattern = FileList['spec/acceptance/*_spec.rb']
+    spec.pattern = FileList['spec/acceptance/**/*_spec.rb']
   end if File.exists?('spec/acceptance')
 rescue LoadError
 end

data/test/unit/bbq_install_generator_test.rb

@@ -25,13 +25,11 @@ class BbqInstallGeneratorTest < Rails::Generators::TestCase
     run_generator %w(-t test_unit)
 
     assert_file "test/support/test_user.rb", /class TestUser < Bbq::TestUser/
-    assert_file "test/support/test_user.rb", /require "test_helper"/
   end
 
   def test_creating_rspec_test_user_stub
     run_generator %w(-t rspec)
 
     assert_file "spec/support/test_user.rb", /class TestUser < Bbq::TestUser/
-    assert_file "spec/support/test_user.rb", /require "spec_helper"/
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbq
 version: !ruby/object:Gem::Version
-  version: 0.0.2.beta.2
+  version: 0.0.2.beta.3
   prerelease: 6
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &10809360 !ruby/object:Gem::Requirement
+  requirement: &18226200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *10809360
+  version_requirements: *18226200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10804540 !ruby/object:Gem::Requirement
+  requirement: &18222220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *10804540
+  version_requirements: *18222220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10799420 !ruby/object:Gem::Requirement
+  requirement: &18196400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *10799420
+  version_requirements: *18196400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10795560 !ruby/object:Gem::Requirement
+  requirement: &18195000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *10795560
+  version_requirements: *18195000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10793120 !ruby/object:Gem::Requirement
+  requirement: &18192820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *10793120
+  version_requirements: *18192820
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &10786860 !ruby/object:Gem::Requirement
+  requirement: &18191660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *10786860
+  version_requirements: *18191660
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &10776400 !ruby/object:Gem::Requirement
+  requirement: &18190720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *10776400
+  version_requirements: *18190720
 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: -1304765227938922148
+      hash: 2685658367770402015
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: