refinerycms-testing 2.1.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f3d50c04da3b7c81c95d01e3c46d22f35cb0d4
-  data.tar.gz: ce824dc24a00af88b25f1d704e84c0ed4b0a2d35
+  metadata.gz: 3e82b4a627c96a19f3332f179dbef51b08a21d13
+  data.tar.gz: 412cb490a55d456433e407c4d61fb30f5c8f022a
 SHA512:
-  metadata.gz: 5d880697c04d502db69f9ded0422623fd2f85b762f0fb9099329bbf0218fef7d724de9922224e65165f80bc37ada987614b54b2266d13dc8a135b8e292eeaf54
-  data.tar.gz: 6adb20fe300fc41deb31e87336e7c7a2f91427f2f0be62527acb35cc9d6804cce31df0bd6b1d39f599f060df00814656099e56f5d13df242a651ae9eb0462bb2
+  metadata.gz: ab5585826093c7103527a081038f5fbae8053cc56333f82a7ee64576ef74b2a8523db13f8e060114751f6b6bd98c3e6eed31f41fe6f5a6cb7330f2cd0c70ffa9
+  data.tar.gz: 38ff53a4fdb5b376483012ba39f4455dace33e187d51f875eaa5b075793c3aca041bf48fae6653dbc0cc52d7358b92688a86dce812565b53f36057358b1862eb

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

@@ -13,7 +13,7 @@ guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => '
   end
 end
 
-guard 'rspec', :version => 2, :spec_paths => extensions.map{|e| "#{e}/spec"},
+guard 'rspec', :version => 2, :spec_paths => extensions.map{ |e| "#{e}/spec"},
   :cli => (File.read('.rspec').split("\n").join(' ') if File.exists?('.rspec')) do
   extensions.each do |extension|
     watch(%r{^#{extension}/spec/.+_spec\.rb$})

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

@@ -19,7 +19,7 @@ end
 
 # 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|
+([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

data/lib/refinery/tasks/testing.rake

@@ -1,24 +1,28 @@
 namespace :refinery do
   namespace :testing do
-    desc "Generates a dummy app for testing"
-    task :dummy_app do
-      unless dummy_app_path.exist?
-        Rake::Task["refinery:testing:setup_dummy_app"].invoke
-        Rake::Task["refinery:testing:setup_extension"].invoke
-        Rake::Task["refinery:testing:init_test_database"].invoke
-      end
-    end
+    desc "Generates a dummy application for testing, if one doesn't exist."
+    task :dummy_app => [
+      :report_dummy_app_status,
+      :create_dummy_app
+    ]
 
-    task :setup_dummy_app do
-      require 'refinerycms'
+    desc "Creates a dummy application for testing"
+    task :create_dummy_app => [
+      :setup_dummy_app,
+      :setup_extension,
+      :init_test_database
+    ]
 
-      params = %w(--quiet)
-      params << "--database=#{ENV['DB']}" if ENV['DB']
+    desc "raises if there is already a dummy application"
+    task :report_dummy_app_status do
+      raise "\nPlease rm -rf '#{dummy_app_path}'\n\n" if dummy_app_path.exist?
+    end
 
-      Refinery::DummyGenerator.start params
+    desc "Sets up just the dummy application for testing, no migrations or extensions"
+    task :setup_dummy_app do
+      require 'refinerycms-core'
 
-      # Ensure the database is not there from a previous run.
-      Rake::Task['refinery:testing:drop_dummy_app_database'].invoke
+      Refinery::DummyGenerator.start %W[--quiet --database=#{ENV['DB'].presence || 'sqlite3'}]
 
       Refinery::CmsGenerator.start %w[--quiet --fresh-installation]
 
@@ -41,19 +45,17 @@ namespace :refinery do
     end
 
     desc "Remove the dummy app used for testing"
-    task :clean_dummy_app do
-      Rake::Task['refinery:testing:drop_dummy_app_database'].invoke
+    task :clean_dummy_app => [:drop_dummy_app_database] do
       dummy_app_path.rmtree if dummy_app_path.exist?
     end
 
     desc "Remove the dummy app's database."
     task :drop_dummy_app_database do
-      load 'rails/tasks/engine.rake'
-      Rake::Task['app:db:drop'].invoke
+      system "bundle exec rake -f #{File.join(dummy_app_path, 'Rakefile')} db:drop"
     end
 
     task :init_test_database do
-      system "bundle exec rake -f #{dummy_app_path.join('Rakefile')} db:test:prepare"
+      system "RAILS_ENV=test bundle exec rake -f #{File.join(dummy_app_path, 'Rakefile')} db:create db:migrate"
     end
 
     def dummy_app_path

data/lib/refinery/testing.rb

@@ -1,6 +1,6 @@
 require 'refinerycms-core'
 require 'rspec-rails'
-require 'factory_girl_rails'
+require 'factory_girl'
 
 module Refinery
   autoload :TestingGenerator, 'generators/refinery/testing/testing_generator'

data/lib/refinery/testing/controller_macros.rb

@@ -2,7 +2,7 @@ module Refinery
   module Testing
     module ControllerMacros
       autoload :Authentication, 'refinery/testing/controller_macros/authentication'
-      autoload :Methods, 'refinery/testing/controller_macros/methods'
+      autoload :Routes        , 'refinery/testing/controller_macros/routes'
     end
   end
 end

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

@@ -2,80 +2,21 @@ module Refinery
   module Testing
     module ControllerMacros
       module Authentication
-        def self.extended(base)
-          base.send :include, Devise::TestHelpers
-        end
 
         def refinery_login_with(*roles)
-          mock_user roles
+          Refinery.deprecate('refinery_login_with', when: '3.1', replacement: 'refinery_login')
+          refinery_login
         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 factory_user(factory)
-          let(:logged_in_user) { FactoryGirl.create factory }
-          before do
-            @request.env["devise.mapping"] = Devise.mappings[:admin]
-            sign_in logged_in_user
-          end
+          Refinery.deprecate('refinery_login_with_factory', when: '3.1', replacement: 'refinery_login')
+          refinery_login
         end
 
-        def login_user
-          Refinery.deprecate :login_user, :when => '2.2', :replacement => 'refinery_login_with :user'
-          refinery_login_with :user
+        def refinery_login
+          let(:logged_in_user) { Refinery::Core::NilUser.new }
         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
-
-        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
   end

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

@@ -0,0 +1,12 @@
+module Refinery
+  module Testing
+    module ControllerMacros
+      module Routes
+        extend ActiveSupport::Concern
+        included do
+          routes { ::Refinery::Core::Engine.routes }
+        end
+      end
+    end
+  end
+end

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

@@ -2,28 +2,16 @@ 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)
+        def refinery_login
+          # NO-OP, Overwrite this in an extension.
         end
 
-        def login_refinery_superuser
-          Refinery.deprecate(:login_refinery_superuser, :when => '2.2', :replacement => 'refinery_login_with :refinery_superuser')
-          refinery_login_with(:refinery_superuser)
+        def refinery_login_with(factory)
+          Refinery.deprecate('refinery_login_with', when: '3.1', replacement: 'refinery_login')
+          refinery_login
         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

data/refinerycms-testing.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Testing plugin for Refinery CMS}
   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.email             = %q{refinerycms@p.arndt.io}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
 
   s.add_dependency 'refinerycms-core',        version
-  s.add_dependency 'database_cleaner',        '~> 1.2.0'
-  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.38.0'
-  s.add_dependency 'mime-types',              '~> 1.16'
+  s.add_dependency 'database_cleaner',        '~> 1.3.0'
+  s.add_dependency 'factory_girl_rails',      '~> 4.4.1'
+  s.add_dependency 'rspec-rails',             '~> 3.0'
+  s.add_dependency 'capybara',                '~> 2.4.3'
+
+  s.required_ruby_version = Refinery::Version.required_ruby_version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-testing
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -18,101 +18,73 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.38.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.38.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.4.3
 description: This plugin adds the ability to tests against the Refinery CMS gem while
   inside a Refinery CMS extension
-email: info@refinerycms.com
+email: refinerycms@p.arndt.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -125,7 +97,7 @@ files:
 - lib/refinery/testing.rb
 - lib/refinery/testing/controller_macros.rb
 - lib/refinery/testing/controller_macros/authentication.rb
-- lib/refinery/testing/controller_macros/methods.rb
+- lib/refinery/testing/controller_macros/routes.rb
 - lib/refinery/testing/feature_macros.rb
 - lib/refinery/testing/feature_macros/authentication.rb
 - lib/refinery/testing/railtie.rb
@@ -143,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -151,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Testing plugin for Refinery CMS

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

@@ -1,33 +0,0 @@
-module Refinery
-  module Testing
-    module ControllerMacros
-      module Methods
-        def get(action, parameters = nil, session = nil, flash = nil)
-          process_refinery_action(action, parameters, session, flash, "GET")
-        end
-
-        # Executes a request simulating POST HTTP method and set/volley the response
-        def post(action, parameters = nil, session = nil, flash = nil)
-          process_refinery_action(action, parameters, session, flash, "POST")
-        end
-
-        # Executes a request simulating PUT HTTP method and set/volley the response
-        def put(action, parameters = nil, session = nil, flash = nil)
-          process_refinery_action(action, parameters, session, flash, "PUT")
-        end
-
-        # Executes a request simulating DELETE HTTP method and set/volley the response
-        def delete(action, parameters = nil, session = nil, flash = nil)
-          process_refinery_action(action, parameters, session, flash, "DELETE")
-        end
-
-        private
-
-        def process_refinery_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
-          parameters ||= {}
-          process(action, parameters.merge!(:use_route => :refinery), session, flash, method)
-        end
-      end
-    end
-  end
-end