aktion_test_rails 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.3.0
+
+* Update modules to use new spec helper interface
+
+# v0.2.1
+
+* Update matchers to work with new base matcher
+* Upgrade to aktion test 0.2.x
+* Create modules to use with new spec helper loader
+
 # v0.2.0
 
 * ActiveAdmin request spec sign in support

data/README.md

@@ -1,5 +1,6 @@
 # AktionTestRails
 
+[![Code Climate](https://codeclimate.com/github/AktionLab/aktion_test_rails.png)](https://codeclimate.com/github/AktionLab/aktion_test_rails)
 [![Build Status](https://secure.travis-ci.org/AktionLab/aktion_test_rails.png?branch=master)](https://travis-ci.org/AktionLab/aktion_test_rails)
 [![Dependency Status](https://gemnasium.com/AktionLab/aktion_test_rails.png)](https://gemnasium.com/AktionLab/aktion_test_rails)
 

data/aktion_test_rails.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = AktionTestRails::VERSION
 
-  gem.add_dependency 'aktion_test', '~> 0.1.1'
-  gem.add_dependency 'rspec-rails', '~> 2.12.0'
-  gem.add_dependency 'factory_girl_rails', '~> 4.1.0'
-  gem.add_dependency 'database_cleaner', '~> 0.9.1'
-  gem.add_dependency 'capybara', '~> 1.1.3'
-  gem.add_dependency 'poltergeist', '~> 1.0.2'
-  gem.add_dependency 'launchy', '~> 2.1.2'
-  gem.add_dependency 'shoulda-matchers', '~> 1.4.1'
+  gem.add_dependency 'activesupport',      '~> 3.2.11'
+  gem.add_dependency 'aktion_test',        '~> 0.3.0'
+  gem.add_dependency 'rspec-rails',        '~> 2.12.0'
+  gem.add_dependency 'factory_girl_rails', '~> 4.2.0'
+  gem.add_dependency 'database_cleaner',   '~> 0.9.1'
+  gem.add_dependency 'capybara',           '~> 1.1.3'
+  gem.add_dependency 'poltergeist',        '~> 1.0.2'
+  gem.add_dependency 'launchy',            '~> 2.1.2'
+  gem.add_dependency 'shoulda-matchers',   '~> 1.4.1'
 end

data/lib/aktion_test/module/rails.rb

@@ -0,0 +1,11 @@
+module AktionTest
+  module Module
+    class Rails < Base
+      def prepare
+        require options[:path]
+      end
+    end
+  end
+end
+
+ActiveSupport.run_load_hooks :aktion_test_module_rails

data/lib/aktion_test/module/rails/aktion_test.rb

@@ -0,0 +1,12 @@
+module AktionTest
+  module Module
+    class Rails
+      class AktionTest < Base
+        def initialize(spec, options={})
+          spec.use ::AktionTest::Module::AktionTest
+          super
+        end
+      end
+    end
+  end
+end

data/lib/aktion_test/module/rails/capybara.rb

@@ -0,0 +1,30 @@
+module AktionTest
+  module Module
+    class Rails
+      class Capybara < Base
+        def prepare
+          require 'capybara/rails'
+          require 'capybara/rspec'
+          require 'capybara/poltergeist'
+        end
+
+        def configure
+          ::Capybara.javascript_driver = :poltergeist
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_recod) do
+  class ActiveRecord::Base
+    mattr_accessor :shared_connection
+    @@shared_connection = nil
+
+    def self.connection
+      @@shared_connection ||= retrieve_connection
+    end
+  end
+
+  ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+end

data/lib/aktion_test/module/rails/factory_girl.rb

@@ -0,0 +1,21 @@
+module AktionTest
+  module Module
+    class Rails
+      class FactoryGirl < Base
+        def initialize(spec, options={})
+          super
+        end
+
+        def prepare
+          require 'factory_girl_rails'
+        end
+
+        def configure
+          rspec.include ::FactoryGirl::Syntax::Methods
+          rspec.include AktionTestRails::Matchers::FactoryGirl, type: :model
+        end
+      end
+    end
+  end
+end
+

data/lib/aktion_test/module/rails/rspec.rb

@@ -0,0 +1,23 @@
+module AktionTest
+  module Module
+    class Rails
+      class RSpec < Base
+        def initialize(spec, options={})
+          spec.use ::AktionTest::Module::RSpec
+          super
+        end
+
+        def prepare
+          require 'rspec/rails'
+        end
+
+        def configure
+          rspec.fixture_path = "#{::Rails.root}/spec/fixtures"
+          rspec.use_transactional_fixtures = true
+          rspec.infer_base_class_for_anonymous_controllers = false
+        end
+      end
+    end
+  end
+end
+

data/lib/aktion_test/module/rails/shoulda_matchers.rb

@@ -0,0 +1,12 @@
+module AktionTest
+  module Module
+    class Rails
+      class ShouldaMatchers < Base
+        def prepare
+          require 'shoulda-matchers'
+        end
+      end
+    end
+  end
+end
+

data/lib/aktion_test/module/rails/simplecov.rb

@@ -0,0 +1,13 @@
+module AktionTest
+  module Module
+    class Rails
+      class Simplecov < Base
+        def initialize(spec, options={})
+          require 'simplecov'
+          ::SimpleCov.start 'rails'
+          super
+        end
+      end
+    end
+  end
+end

data/lib/aktion_test_rails.rb

@@ -1,15 +1,29 @@
-require 'faker'
 require 'aktion_test'
 require "aktion_test_rails/version"
 
-require 'active_support/dependencies/autoload'
-require 'active_support/concern'
-require 'active_support/lazy_load_hooks'
+module AktionTest
+  module Module
+    extend ActiveSupport::Autoload
+
+    autoload :Rails
+
+    ActiveSupport.on_load(:aktion_test_module_rails) do
+      class Rails
+        extend ActiveSupport::Autoload
+
+        autoload :AktionTest
+        autoload :Capybara
+        autoload :FactoryGirl
+        autoload :RSpec, 'aktion_test/module/rails/rspec'
+        autoload :ShouldaMatchers
+        autoload :Simplecov
+      end
+    end
+  end
+end
 
 module AktionTestRails
   extend ActiveSupport::Autoload
-  
-  autoload :ModelBuilder
 
   module Support
     module Capybara

data/lib/aktion_test_rails/matchers/active_admin/flash.rb

@@ -4,24 +4,19 @@ module AktionTestRails
       module Flash
         def have_flash(type = nil, message = nil)
           type, message = nil, type if message.nil? && type.is_a?(String)
-          FlashMessageMatcher.new(type, message)
+          Matcher.new(type, message)
         end
 
-        class FlashMessageMatcher < AktionTest::Matchers::Base
+        class Matcher < AktionTest::Matchers::Base
           def initialize(type, message)
             @type, @message = type, message
           end
 
-          def matches?(page)
-            @page = page
+        protected
+          
+          def perform_match!
             has_flash? and has_flash_message?
           end
-
-          def negative_failure_message
-            "Did not expect #{expectation}\n#{negative_problem}"
-          end
-
-        protected
           
           def expectation
             expect = "the page to have a flash"
@@ -34,24 +29,24 @@ module AktionTestRails
             "#{expect}."
           end
 
-          def problem
+          def problems_for_should
             message = "\n"
             unless has_flash?
-              if @page.has_selector? '.flash'
+              if @subject.has_selector? '.flash'
                 message << "Found a flash #{find_flash_type}.\n"
               else
                 message << "No flash was found.\n"
               end
             end
             unless has_flash_message?
-              if @page.has_selector? '.flash'
-                message << "expected: #{@message}\n     got: #{flash_message}\n"
+              if @subject.has_selector? '.flash'
+                message << "expected: #{@message}\n     got: #{flash_message}"
               end
             end
-            message
+            message.chomp
           end
 
-          def negative_problem
+          def problems_for_should_not
             message = ""
             if @type.nil? && @message.nil?
               message << "\nFound a flash #{find_flash_type} of `#{flash_message}'."
@@ -62,17 +57,17 @@ module AktionTestRails
             if !@message.nil? && has_flash_message?
               message << "\nFlash message is `#{flash_message}'."
             end
-            "#{message}\n"
+            message
           end
 
         private
 
           def find_flash_type
-            @page.find('.flash')[:class].split(' ')[1].gsub('flash_','')
+            @subject.find('.flash')[:class].split(' ')[1].gsub('flash_','')
           end
 
           def has_flash?
-            @page.has_selector? flash_selector
+            @subject.has_selector? flash_selector
           end
 
           def has_flash_message?
@@ -80,7 +75,7 @@ module AktionTestRails
           end
 
           def flash_message
-            @page.find('.flash').text
+            @subject.find('.flash').text
           end
 
           def flash_selector

data/lib/aktion_test_rails/matchers/factory_girl.rb

@@ -11,8 +11,8 @@ module AktionTestRails
     module FactoryGirl
       extend ActiveSupport::Concern
 
-      included do
-        include Validation
+      included do |base|
+        base.send :include, Validation
       end
     end
   end

data/lib/aktion_test_rails/matchers/factory_girl/validation.rb

@@ -3,23 +3,25 @@ module AktionTestRails
     module FactoryGirl
       module Validation
         def have_valid_factory(factory_name)
-          ValidFactoryMatcher.new(factory_name)
+          Matcher.new(factory_name)
         end
 
-        class ValidFactoryMatcher < AktionTest::Matchers::Base
+        class Matcher < AktionTest::Matchers::Base
           def initialize(factory_name)
             @factory_name = factory_name
           end
 
-          def matches?(subject)
-            factory_exists? && factory_creates_valid_record?
+          def description
+            "has a valid factory named :#{@factory_name}"
           end
 
+        protected
+
           def expectation
             ":#{@factory_name} to be a valid factory."
           end
 
-          def problem
+          def problems_for_should
             message = "\n"
             if factory_exists?
               if @record.errors.full_messages.any?
@@ -31,18 +33,16 @@ module AktionTestRails
             else
               message << "No factory by the name :#{@factory_name} found\n"
             end
-            message
+            message.chomp
           end
 
-          def negative_problem
+          def problems_for_should_not
           end
 
-          def description
-            "has a valid factory named :#{@factory_name}"
+          def perform_match!
+            factory_exists? && factory_creates_valid_record?
           end
 
-        protected
-
           def factory_exists?
             ::FactoryGirl.factories.registered?(@factory_name)
           end

data/lib/aktion_test_rails/version.rb

@@ -1,3 +1,3 @@
 module AktionTestRails
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/aktion_test_rails/model_builder_spec.rb

@@ -1,5 +1,4 @@
-require 'spec_base'
-require 'spec_active_record'
+require 'spec_helper'
 
 describe AktionTestRails::Support::Rails::ModelBuilder do
   include described_class

data/spec/matchers/active_admin/flash_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_base'
+require 'spec_helper'
 
 describe AktionTestRails::Matchers::ActiveAdmin::Flash do
   include described_class

data/spec/matchers/factory_girl/validation_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_base'
-require 'spec_active_record'
-require 'factory_girl_rails'
+require 'spec_helper'
 
 describe AktionTestRails::Matchers::FactoryGirl::Validation do
   include described_class

data/spec/requests/active_admin/sign_in_spec.rb

@@ -1,10 +1,9 @@
-require 'spec_base'
-require 'spec_rails'
+require 'spec_helper'
 
 describe AktionTestRails::Support::ActiveAdmin::Request::SignIn do
   include described_class
 
-  before(:each) do
+  before(:all) do
     unless FactoryGirl.factories.registered?(:admin_user)
       FactoryGirl.define do
         factory :admin_user do

data/spec/spec_helper.rb

@@ -0,0 +1,30 @@
+$:.unshift File.dirname(__FILE__)
+
+require 'aktion_test_rails'
+ENV['RAILS_ENV'] = 'test'
+
+TESTAPP_ROOT = File.join(File.dirname(__FILE__), 'rails_app')
+I18n.load_path << File.join(TESTAPP_ROOT, 'config/locales/en.yml')
+I18n.load_path << File.join(TESTAPP_ROOT, 'config/locales/devise.en.yml')
+
+require 'activeadmin'
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+  add_group 'Modules', 'lib/aktion_test/module'
+  add_group 'Matchers', 'lib/aktion_test_rails/matchers'
+  add_group 'Support', 'lib/aktion_test_rails/support'
+end
+
+AktionTest::SpecHelper.build do
+  use :Timecop, :Faker
+  use :Rails, :path => File.expand_path('../rails_app/config/environment', __FILE__)
+
+  scope 'Rails' do
+    use :RSpec, :AktionTest, :ShouldaMatchers, :FactoryGirl, :Capybara
+  end
+end
+
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aktion_test_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: aktion_test
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +173,14 @@ files:
 - README.md
 - Rakefile
 - aktion_test_rails.gemspec
+- lib/aktion_test/module/rails.rb
+- lib/aktion_test/module/rails/aktion_test.rb
+- lib/aktion_test/module/rails/capybara.rb
+- lib/aktion_test/module/rails/factory_girl.rb
+- lib/aktion_test/module/rails/rspec.rb
+- lib/aktion_test/module/rails/shoulda_matchers.rb
+- lib/aktion_test/module/rails/simplecov.rb
 - lib/aktion_test_rails.rb
-- lib/aktion_test_rails/load.rb
 - lib/aktion_test_rails/matchers/active_admin.rb
 - lib/aktion_test_rails/matchers/active_admin/flash.rb
 - lib/aktion_test_rails/matchers/factory_girl.rb
@@ -207,9 +229,7 @@ files:
 - spec/rails_app/public/robots.txt
 - spec/rails_app/script/rails
 - spec/requests/active_admin/sign_in_spec.rb
-- spec/spec_active_record.rb
-- spec/spec_base.rb
-- spec/spec_rails.rb
+- spec/spec_helper.rb
 homepage: http://aktionlab.com
 licenses: []
 post_install_message: 
@@ -274,6 +294,4 @@ test_files:
 - spec/rails_app/public/robots.txt
 - spec/rails_app/script/rails
 - spec/requests/active_admin/sign_in_spec.rb
-- spec/spec_active_record.rb
-- spec/spec_base.rb
-- spec/spec_rails.rb
+- spec/spec_helper.rb

data/lib/aktion_test_rails/load.rb

@@ -1,18 +0,0 @@
-require 'rspec-rails'
-require 'rspec/rails'
-require 'shoulda-matchers'
-require 'factory_girl_rails'
-require 'timecop'
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.mock_with :rspec
-
-  config.before :each do
-    Timecop.return if defined? Timecop
-  end
-
-  config.after :each do
-    Timecop.return if defined? Timecop
-  end
-end

data/spec/spec_active_record.rb

@@ -1,13 +0,0 @@
-require 'active_record'
-require 'rspec/rails/adapters'
-require 'rspec/rails/fixture_support'
-
-if RUBY_PLATFORM =~ /java/
-  ActiveRecord::Base.establish_connection(adapter: 'jdbcsqlite3', database: 'tmp/test.sqlite3')
-else
-  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: 'tmp/test.sqlite3')
-end
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-end

data/spec/spec_base.rb

@@ -1,28 +0,0 @@
-ENV['RAILS_ENV'] = 'test'
-
-require 'simplecov'
-
-SimpleCov.start do
-  add_filter '/tmp/'
-  add_filter '/spec/'
-  add_filter '/lib/aktion_test_rails/matchers/factory_girl.rb'
-  add_filter '/lib/aktion_test_rails/matchers/active_admin.rb'
-  add_filter '/lib/aktion_test_rails/support/active_admin/request.rb'
-  add_filter '/lib/aktion_test_rails/rails.rb'
-  add_filter '/lib/aktion_test_rails.rb'
-  minimum_coverage 100
-end
-
-FileUtils.mkdir('tmp') unless Dir.exists?('tmp')
-
-require 'aktion_test_rails'
-require 'capybara'
-require 'active_support/core_ext/string'
-
-Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each{|file| require file}
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.order = 'random'
-end

data/spec/spec_rails.rb

@@ -1,18 +0,0 @@
-TESTAPP_ROOT = File.join(File.dirname(__FILE__), 'rails_app')
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
-
-$:.unshift File.dirname(__FILE__)
-$:.unshift File.join(PROJECT_ROOT, 'lib')
-
-require "rails_app/config/environment"
-require 'aktion_test_rails/rails'
-
-I18n.load_path << File.join(TESTAPP_ROOT, 'config/locales/en.yml')
-I18n.load_path << File.join(TESTAPP_ROOT, 'config/locales/devise.en.yml')
-
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-end