refinerycms-testing 2.0.10 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f886a59675d1a3482f95813865197f602ab0206
-  data.tar.gz: ca037389db61806659605ae5f49f43966c588c19
+  metadata.gz: e365214719c30cca8e9a7f2cfd6e5a75deed6b2b
+  data.tar.gz: c89fdc7c78d4473d17afa1f2b6cc2c8379e4b360
 SHA512:
-  metadata.gz: 621ba7d4c291b6bdeebd39202ea064f8019af3049452fa3881f27f56c13a9af9f997a9cd244e1be4500f2f3b01dc3898876ed82be3905d8992512b04968c5a94
-  data.tar.gz: f1ccedba1a1f53c7a0b4dde5c55f8bfc87be38f3ecbf4b86e9b1763e568f8ef006349ca7ab410a004784184e4014baba358ac5777a1b734da0789f86ccdd398a
+  metadata.gz: df0dbac4556ed0bba5de1bfba7b8038870a77c8a504f3bb19d3a5d4945478409f211eb30d1b6b3358ae0a25ca82fa24996781f8ef48a3fbd52741c2f78426248
+  data.tar.gz: b6f2d359153568d461dec0dd230af6acc80d13324d4058eb91f85e724cd944ef1732d5070c5c711ca86a09522b39d29489604c347eb0ddced6cc4293f5c0de94

data/lib/generators/refinery/testing/templates/Guardfile

@@ -1,4 +1,4 @@
-extensions = Dir[File.expand_path('../vendor/extensions/*', __FILE__)]
+extensions = Dir[ 'vendor/extensions/*' ]
 
 guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => 'test' } do
   watch('config/application.rb')
@@ -24,7 +24,7 @@ guard 'rspec', :version => 2, :spec_paths => extensions.map{|e| "#{e}/spec"},
     watch("#{extension}/spec/spec_helper.rb")                        { "#{extension}/spec" }
     watch("#{extension}/config/routes.rb")                           { "#{extension}/spec/routing" }
     watch("#{extension}/app/controllers/application_controller.rb")  { "#{extension}/spec/controllers" }
-    # Capybara request specs
-    watch(%r{^#{extension}/app/views/(.+)/.*\.(erb|haml)$})          { |m| "#{extension}/spec/requests/#{m[1]}_spec.rb" }
+    # Capybara feature specs
+    watch(%r{^#{extension}/app/views/(.+)/.*\.(erb|haml)$})          { |m| "#{extension}/spec/features/#{m[1]}_spec.rb" }
   end
 end

data/lib/generators/refinery/testing/templates/spec/spec_helper.rb

@@ -1,52 +1,26 @@
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../') unless defined?(ENGINE_RAILS_ROOT)
 
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path("../../config/environment", __FILE__)
 
-  require 'rspec/rails'
-  require 'capybara/rspec'
+require 'rspec/rails'
+require 'capybara/rspec'
 
-  Rails.backtrace_cleaner.remove_silencers!
+Rails.backtrace_cleaner.remove_silencers!
 
-  RSpec.configure do |config|
-    config.mock_with :rspec
-    config.treat_symbols_as_metadata_keys_with_true_values = true
-    config.filter_run :focus => true
-    config.run_all_when_everything_filtered = true
-  end
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
-def each_run
-  Rails.cache.clear
-  ActiveSupport::Dependencies.clear
-  FactoryGirl.reload
-
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories including factories.
-  ([ENGINE_RAILS_ROOT, Rails.root.to_s].uniq | ::Refinery::Plugins.registered.pathnames).map{|p|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
-end
-
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
-
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([ENGINE_RAILS_ROOT, Rails.root.to_s].uniq | ::Refinery::Plugins.registered.pathnames).map{|p|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

data/lib/generators/refinery/testing/testing_generator.rb

@@ -6,10 +6,6 @@ module Refinery
       rake "refinery_testing:install:migrations"
     end
 
-    def copy_guardfile
-      template "Guardfile"
-    end
-
     def copy_spec_helper
       directory "spec"
     end

data/lib/refinery/testing.rb

@@ -27,6 +27,6 @@ module Refinery
     require 'refinery/testing/railtie'
 
     autoload :ControllerMacros, 'refinery/testing/controller_macros'
-    autoload :RequestMacros, 'refinery/testing/request_macros'
+    autoload :FeatureMacros, 'refinery/testing/feature_macros'
   end
 end

data/lib/refinery/testing/controller_macros/authentication.rb

@@ -3,39 +3,78 @@ module Refinery
     module ControllerMacros
       module Authentication
         def self.extended(base)
-          base.send(:include, Devise::TestHelpers)
+          base.send :include, Devise::TestHelpers
         end
 
-        def login_user
-          let(:user) { FactoryGirl.create(:user) }
-          before(:each) do
-            @request.env["devise.mapping"] = Devise.mappings[:admin]
-            sign_in user
+        def refinery_login_with(*roles)
+          mock_user roles
+        end
+
+        def refinery_login_with_factory(factory)
+          factory_user factory
+        end
+
+        def mock_user(roles)
+          let(:controller_permission) { true }
+          roles = handle_deprecated_roles! roles
+          let(:logged_in_user) do
+            user = double 'Refinery::User', :username => 'Joe Fake'
+
+            roles.each do |role|
+              user.stub(:has_role?).with(role).and_return true
+            end
+            user.stub(:has_role?).with(:superuser).and_return false if roles.exclude? :superuser
+
+            user
+          end
+
+          before do
+            controller.should_receive(:require_refinery_users!).and_return false
+            controller.should_receive(:authenticate_refinery_user!).and_return true
+            controller.should_receive(:restrict_plugins).and_return true
+            controller.should_receive(:allow_controller?).and_return controller_permission
+            controller.stub(:refinery_user?).and_return true
+            controller.stub(:current_refinery_user).and_return logged_in_user
           end
         end
 
-        def login_refinery_user
-          let(:refinery_user) { FactoryGirl.create(:refinery_user) }
-          before(:each) do
+        def factory_user(factory)
+          let(:logged_in_user) { FactoryGirl.create factory }
+          before do
             @request.env["devise.mapping"] = Devise.mappings[:admin]
-            sign_in refinery_user
+            sign_in logged_in_user
           end
         end
 
+        def login_user
+          Refinery.deprecate :login_user, :when => '2.2', :replacement => 'refinery_login_with :user'
+          refinery_login_with :user
+        end
+
+        def login_refinery_user
+          Refinery.deprecate :login_refinery_user, :when => '2.2', :replacement => 'refinery_login_with :refinery_user'
+          refinery_login_with :refinery_user
+        end
+
         def login_refinery_superuser
-          let(:refinery_superuser) { FactoryGirl.create(:refinery_superuser) }
-          before(:each) do
-            @request.env["devise.mapping"] = Devise.mappings[:admin]
-            sign_in refinery_superuser
-          end
+          Refinery.deprecate :login_refinery_superuser, :when => '2.2', :replacement => 'refinery_login_with :refinery_superuser'
+          refinery_login_with :refinery_superuser
         end
 
         def login_refinery_translator
-          let(:refinery_translator) { FactoryGirl.create(:refinery_translator) }
-          before(:each) do
-            @request.env["devise.mapping"] = Devise.mappings[:admin]
-            sign_in refinery_translator
-          end
+          Refinery.deprecate :login_refinery_translator, :when => '2.2', :replacement => 'refinery_login_with :refinery_translator'
+          refinery_login_with :refinery_translator
+        end
+
+        private
+        def handle_deprecated_roles!(*roles)
+          mappings = {
+            :user => [],
+            :refinery_user => [:refinery],
+            :refinery_superuser => [:refinery, :superuser],
+            :refinery_translator => [:refinery, :translator]
+          }
+          mappings[roles.first] || roles
         end
       end
     end

data/lib/refinery/testing/feature_macros.rb

@@ -0,0 +1,7 @@
+module Refinery
+  module Testing
+    module FeatureMacros
+      autoload :Authentication, 'refinery/testing/feature_macros/authentication'
+    end
+  end
+end

data/lib/refinery/testing/feature_macros/authentication.rb

@@ -0,0 +1,30 @@
+module Refinery
+  module Testing
+    module FeatureMacros
+      module Authentication
+        def refinery_login_with(factory)
+          let!(:logged_in_user) { FactoryGirl.create(factory) }
+
+          before do
+            login_as logged_in_user, :scope => :refinery_user
+          end
+        end
+
+        def login_refinery_user
+          Refinery.deprecate(:login_refinery_user, :when => '2.2', :replacement => 'refinery_login_with :refinery_user')
+          refinery_login_with(:refinery_user)
+        end
+
+        def login_refinery_superuser
+          Refinery.deprecate(:login_refinery_superuser, :when => '2.2', :replacement => 'refinery_login_with :refinery_superuser')
+          refinery_login_with(:refinery_superuser)
+        end
+
+        def login_refinery_translator
+          Refinery.deprecate(:login_refinery_translator, :when => '2.2', :replacement => 'refinery_login_with :refinery_translator')
+          refinery_login_with(:refinery_translator)
+        end
+      end
+    end
+  end
+end

data/refinerycms-testing.gemspec

@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -9,7 +8,7 @@ Gem::Specification.new do |s|
   s.name              = %q{refinerycms-testing}
   s.version           = version
   s.summary           = %q{Testing plugin for Refinery CMS}
-  s.description       = %q{This plugin adds the ability to run rspec against the Refinery CMS gem while inside a Refinery CMS project}
+  s.description       = %q{This plugin adds the ability to tests against the Refinery CMS gem while inside a Refinery CMS extension}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -20,8 +19,9 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
 
   s.add_dependency 'refinerycms-core',        version
-  s.add_dependency 'database_cleaner',        '~> 0.7.2'
-  s.add_dependency 'factory_girl_rails',      '~> 1.7.0'
-  s.add_dependency 'rspec-rails',             '~> 2.11'
-  s.add_dependency 'capybara',                '~> 1.1.2'
+  s.add_dependency 'database_cleaner',        '~> 1.0.1'
+  s.add_dependency 'factory_girl_rails',      '~> 4.2.1'
+  s.add_dependency 'rspec-rails',             '~> 2.13'
+  s.add_dependency 'capybara',                '~> 2.1.0'
+  s.add_dependency 'selenium-webdriver',      '~> 2.33.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-testing
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -18,72 +18,86 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
-description: This plugin adds the ability to run rspec against the Refinery CMS gem
-  while inside a Refinery CMS project
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.33.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.33.0
+description: This plugin adds the ability to tests against the Refinery CMS gem while
+  inside a Refinery CMS extension
 email: info@refinerycms.com
 executables: []
 extensions: []
@@ -98,9 +112,9 @@ files:
 - lib/refinery/testing/controller_macros.rb
 - lib/refinery/testing/controller_macros/authentication.rb
 - lib/refinery/testing/controller_macros/methods.rb
+- lib/refinery/testing/feature_macros.rb
+- lib/refinery/testing/feature_macros/authentication.rb
 - lib/refinery/testing/railtie.rb
-- lib/refinery/testing/request_macros.rb
-- lib/refinery/testing/request_macros/authentication.rb
 - lib/refinerycms-testing.rb
 - refinerycms-testing.gemspec
 homepage: http://refinerycms.com

data/lib/refinery/testing/request_macros.rb

@@ -1,7 +0,0 @@
-module Refinery
-  module Testing
-    module RequestMacros
-      autoload :Authentication, 'refinery/testing/request_macros/authentication'
-    end
-  end
-end

data/lib/refinery/testing/request_macros/authentication.rb

@@ -1,63 +0,0 @@
-module Refinery
-  module Testing
-    module RequestMacros
-      module Authentication
-        def login_refinery_user
-          before do
-            password = '123456'
-            refinery_user = FactoryGirl.create(:refinery_user, {
-              :username => "refinerycms",
-              :password => password,
-              :password_confirmation => password,
-              :email => "refinerycms@refinerycms.com"
-            })
-
-            visit refinery.new_refinery_user_session_path
-
-            fill_in "Login", :with => refinery_user.username
-            fill_in "Password", :with => password
-
-            click_button "Sign in"
-          end
-        end
-
-        def login_refinery_superuser
-          before(:each) do
-            password = '123456'
-            refinery_superuser = FactoryGirl.create(:refinery_superuser, {
-              :username => "refinerycms",
-              :password => password,
-              :password_confirmation => password,
-              :email => "refinerycms@refinerycms.com"
-            })
-
-            visit refinery.new_refinery_user_session_path
-
-            fill_in "Login", :with => refinery_superuser.username
-            fill_in "Password", :with => password
-
-            click_button "Sign in"
-          end
-        end
-
-        def login_refinery_translator
-          before do
-            password = '123456'
-            FactoryGirl.create(:refinery_user)
-            user = FactoryGirl.create(:refinery_translator, {
-              :password => password,
-              :password_confirmation => password
-            })
-
-            visit refinery.new_refinery_user_session_path
-
-            fill_in "Login", :with => user.username
-            fill_in "Password", :with => password
-
-            click_button "Sign in"
-          end
-        end
-      end
-    end
-  end
-end