wicked 1.0.3 → 2.0.0

data/test/dummy/config/application.rb

@@ -41,5 +41,8 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    config.eager_load = false
+    config.secret_key_base = 'foo'
   end
 end

data/test/dummy/config/environments/development.rb

@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/test/dummy/config/environments/test.rb

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.whiny_nils = true if Rails::VERSION::MAJOR == 3
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -32,4 +32,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.active_support.test_order = :sorted
 end

data/test/dummy/config/routes.rb

@@ -4,9 +4,13 @@ Dummy::Application.routes.draw do
   resources :jump
   resources :step_positions
   resources :dynamic_steps
+  resources :dynamic_different_steps
   resources :string_steps
   resources :redirect_to_next
   resources :redirect_to_finish_flash
+  resources :status_codes
+  resources :updates
+  resources :update_params
 
   resources :nested do
     resources :builder, :controller => 'nested/builder'

data/test/integration/dynamic_steps_test.rb

@@ -1,10 +1,17 @@
 require 'test_helper'
 
 class DynamicStepsTest < ActiveSupport::IntegrationCase
-  test 'set dynamic steps from params' do
+  test 'set dynamic steps from params using prepend' do
     steps = ['first', 'second']
     visit dynamic_steps_path(:steps => steps)
     assert_has_content?(steps.first.inspect)
     assert_has_content?(steps.inspect)
   end
+
+  test 'set dynamic steps from params without using' do
+    steps = ['first', 'second']
+    visit dynamic_different_steps_path(:steps => steps)
+    assert_has_content?(steps.first.inspect)
+    assert_has_content?(steps.inspect)
+  end
 end

data/test/integration/helpers_test.rb

@@ -5,13 +5,23 @@ class HelpersTest < ActiveSupport::IntegrationCase
   test 'next_wizard_path' do
     step = :first
     visit(bar_path(step))
+    assert has_link?('skip', href: '/bar/second')
     click_link 'skip'
     assert_has_content?('second')
   end
 
+  test 'next_wizard_url' do
+    step = :first
+    visit(bar_path(step))
+    assert has_link?('next url', href: 'http://www.example.com/bar/second')
+    click_link 'next url'
+    assert_has_content?('second')
+  end
+
   test 'wizard_path' do
     step = :first
     visit(bar_path(step))
+    assert has_link?('current', href: '/bar/first')
     click_link 'current'
     assert_has_content?(step.to_s)
   end
@@ -23,9 +33,26 @@ class HelpersTest < ActiveSupport::IntegrationCase
     assert_has_content?('last_step')
   end
 
+  test 'wizard_url' do
+    step = :first
+    visit(bar_path(step))
+    assert has_link?('current url', href: 'http://www.example.com/bar/first')
+    click_link 'current'
+    assert_has_content?(step.to_s)
+  end
+
   test 'previous_wizard_path' do
     step = :second
     visit(bar_path(step))
+    assert has_link?('previous', href: '/bar/first')
+    click_link 'previous'
+    assert_has_content?("first")
+  end
+
+  test 'previous_wizard_url' do
+    step = :second
+    visit(bar_path(step))
+    assert has_link?('previous url', href: 'http://www.example.com/bar/first')
     click_link 'previous'
     assert_has_content?("first")
   end

data/test/integration/jump_test.rb

@@ -13,4 +13,20 @@ class JumpNavigationTest < ActiveSupport::IntegrationCase
     assert_has_content?('first')
     assert !has_content?('last_step')
   end
+
+
+  test 'skip_step takes :skip_step_options and passes them' do
+    step = :first
+    visit(jump_path(step, :skip_step => true, :skip_step_options => {:foo => :bar}))
+    assert_has_content?('second')
+    assert !has_content?('last_step')
+  end
+
+  test 'jump_to takes :skip_step_options and passes them' do
+    step = :first
+    visit(jump_path(step, :resource => {:save => true}, :jump_to => :last_step, :skip_step_options => {:foo => :bar}))
+    assert_has_content?("foo")
+    assert_has_content?("bar")
+    assert_has_content?('last_step')
+  end
 end

data/test/integration/redirect_to_next_test.rb

@@ -26,4 +26,4 @@ class RedirectToNextTest < ActiveSupport::IntegrationCase
     assert_has_content?('home')
     assert_has_content?('notice:jump notice')
   end
-end
+end

data/test/integration/security_test.rb

@@ -7,7 +7,6 @@ class SecurityTest < ActiveSupport::IntegrationCase
     assert_raise(Wicked::Wizard::InvalidStepError) do
       visit(bar_path(step))
     end
-    refute has_content?('sqlite3')
   end
 
   # only works on *nix systems
@@ -18,6 +17,5 @@ class SecurityTest < ActiveSupport::IntegrationCase
     assert_raise(Wicked::Wizard::InvalidStepError) do
       visit(bar_path(step))
     end
-    refute has_content?('aardvark')
   end
 end

data/test/integration/update_params_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class UpdateParamsTest < ActiveSupport::IntegrationCase
+  test 'on first' do
+    step = :first
+    visit(update_param_path(step))
+
+    click_button("Next")
+    assert_equal page.current_path, update_param_path(:second)
+    assert_has_content?("notice:Thing was updated from step first.")
+
+    click_button("Next")
+    assert_equal page.current_path, update_param_path(:last_step)
+    assert_has_content?("notice:Thing was updated from step second.")
+
+    click_button("Next")
+    assert_equal page.current_url, update_params_url({host: 'www.example.com', one: 'two' })
+    assert_has_content?("notice:Thing was updated from step last_step.")
+  end
+end

data/test/integration/updates_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class UpdatesTest < ActiveSupport::IntegrationCase
+  test 'on first' do
+    step = :first
+    visit(update_path(step))
+
+    click_button("Next")
+    assert_equal page.current_path, update_path(:second)
+    assert_has_content?("notice:Thing was updated from step first.")
+
+    click_button("Next")
+    assert_equal page.current_path, update_path(:last_step)
+    assert_has_content?("notice:Thing was updated from step second.")
+
+    click_button("Next")
+    assert_equal page.current_path, updates_path
+    assert_has_content?("notice:Thing was updated from step last_step.")
+  end
+end

data/test/support/wicked_controller_test_case.rb

@@ -0,0 +1,9 @@
+class WickedControllerTestCase < ActionController::TestCase
+  if ActionPack::VERSION::MAJOR < 5
+    %w{get post put update}.each do |meth|
+      define_method meth do |action, args={}|
+        super(action, args[:params], args[:session], args[:flash])
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,10 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-
-
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
-
-
-
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"
@@ -21,10 +16,15 @@ require "capybara/rails"
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
-
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+# https://github.com/plataformatec/devise/blob/master/test/orm/active_record.rb
+migrate_path = File.expand_path("../rails_app/db/migrate", __FILE__)
+if ActiveRecord.version < Gem::Version.create("5.2.0")
+  ActiveRecord::Migrator.migrate(migrate_path)
+elsif ActiveRecord.version < Gem::Version.create("6.0.0")
+  ActiveRecord::MigrationContext.new(migrate_path).migrate
+else
+  ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
+end
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/wicked.gemspec

@@ -1,155 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: wicked 1.0.3 ruby lib
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'wicked/version'
 
-Gem::Specification.new do |s|
-  s.name = "wicked"
-  s.version = "1.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["schneems"]
-  s.date = "2014-04-25"
-  s.description = "Wicked is a Rails engine for producing easy wizard controllers"
-  s.email = "richard.schneeman@gmail.com"
-  s.extra_rdoc_files = [
+Gem::Specification.new do |gem|
+  gem.name          = "wicked"
+  gem.version       = Wicked::VERSION
+  gem.authors       = ["Richard Schneeman"]
+  gem.email         = ["richard.schneeman+rubygems@gmail.com"]
+  gem.description   = "Wicked is a Rails engine for producing easy wizard controllers"
+  gem.summary       = "Use Wicked to turn your controller into a wizard"
+  gem.homepage      = "https://github.com/schneems/wicked"
+  gem.license       = "MIT"
+  gem.extra_rdoc_files = [
     "README.md"
   ]
-  s.files = [
-    ".rvmrc",
-    ".travis.yml",
-    "CHANGELOG.md",
-    "Gemfile",
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/controllers/wicked/wizard_controller.rb",
-    "lib/wicked.rb",
-    "lib/wicked/controller/concerns/path.rb",
-    "lib/wicked/controller/concerns/render_redirect.rb",
-    "lib/wicked/controller/concerns/steps.rb",
-    "lib/wicked/engine.rb",
-    "lib/wicked/wizard.rb",
-    "lib/wicked/wizard/translated.rb",
-    "test/controllers/bar_controller_test.rb",
-    "test/dummy/Rakefile",
-    "test/dummy/app/controllers/application_controller.rb",
-    "test/dummy/app/controllers/bar_controller.rb",
-    "test/dummy/app/controllers/dynamic_steps_controller.rb",
-    "test/dummy/app/controllers/i18n_controller.rb",
-    "test/dummy/app/controllers/jump_controller.rb",
-    "test/dummy/app/controllers/nested/builder_controller.rb",
-    "test/dummy/app/controllers/pages_controller.rb",
-    "test/dummy/app/controllers/redirect_to_finish_flash_controller.rb",
-    "test/dummy/app/controllers/redirect_to_next_controller.rb",
-    "test/dummy/app/controllers/steps_controller.rb",
-    "test/dummy/app/controllers/string_steps_controller.rb",
-    "test/dummy/app/helpers/application_helper.rb",
-    "test/dummy/app/models/bar.rb",
-    "test/dummy/app/views/bar/first.html.erb",
-    "test/dummy/app/views/bar/last_step.html.erb",
-    "test/dummy/app/views/bar/second.html.erb",
-    "test/dummy/app/views/dynamic_steps/first.html.erb",
-    "test/dummy/app/views/i18n/first.html.erb",
-    "test/dummy/app/views/i18n/last_step.html.erb",
-    "test/dummy/app/views/i18n/second.html.erb",
-    "test/dummy/app/views/jump/first.html.erb",
-    "test/dummy/app/views/jump/last_step.html.erb",
-    "test/dummy/app/views/jump/second.html.erb",
-    "test/dummy/app/views/layouts/application.html.erb",
-    "test/dummy/app/views/nested/builder/first.html.erb",
-    "test/dummy/app/views/nested/builder/last_step.html.erb",
-    "test/dummy/app/views/nested/builder/second.html.erb",
-    "test/dummy/app/views/pages/index.html.erb",
-    "test/dummy/app/views/redirect_to_finish_flash/index.html.erb",
-    "test/dummy/app/views/redirect_to_finish_flash/last_step.html.erb",
-    "test/dummy/app/views/redirect_to_next/first.html.erb",
-    "test/dummy/app/views/redirect_to_next/last_step.html.erb",
-    "test/dummy/app/views/redirect_to_next/second.html.erb",
-    "test/dummy/app/views/step_positions/_step_position.html.erb",
-    "test/dummy/app/views/step_positions/first.html.erb",
-    "test/dummy/app/views/step_positions/last_step.html.erb",
-    "test/dummy/app/views/step_positions/second.html.erb",
-    "test/dummy/app/views/string_steps/second.html.erb",
-    "test/dummy/config.ru",
-    "test/dummy/config/application.rb",
-    "test/dummy/config/boot.rb",
-    "test/dummy/config/database.yml",
-    "test/dummy/config/environment.rb",
-    "test/dummy/config/environments/development.rb",
-    "test/dummy/config/environments/production.rb",
-    "test/dummy/config/environments/test.rb",
-    "test/dummy/config/initializers/backtrace_silencers.rb",
-    "test/dummy/config/initializers/inflections.rb",
-    "test/dummy/config/initializers/mime_types.rb",
-    "test/dummy/config/initializers/secret_token.rb",
-    "test/dummy/config/initializers/session_store.rb",
-    "test/dummy/config/locales/en.yml",
-    "test/dummy/config/locales/es.yml",
-    "test/dummy/config/routes.rb",
-    "test/dummy/public/404.html",
-    "test/dummy/public/422.html",
-    "test/dummy/public/500.html",
-    "test/dummy/public/favicon.ico",
-    "test/dummy/public/javascripts/application.js",
-    "test/dummy/public/javascripts/controls.js",
-    "test/dummy/public/javascripts/dragdrop.js",
-    "test/dummy/public/javascripts/effects.js",
-    "test/dummy/public/javascripts/prototype.js",
-    "test/dummy/public/javascripts/rails.js",
-    "test/dummy/public/stylesheets/.gitkeep",
-    "test/dummy/script/rails",
-    "test/integration/dynamic_steps_test.rb",
-    "test/integration/helpers_test.rb",
-    "test/integration/i18n_test.rb",
-    "test/integration/jump_test.rb",
-    "test/integration/navigation_test.rb",
-    "test/integration/nested_builder_test.rb",
-    "test/integration/redirect_to_finish_flash_test.rb",
-    "test/integration/redirect_to_next_test.rb",
-    "test/integration/security_test.rb",
-    "test/integration/steps_test.rb",
-    "test/support/integration_case.rb",
-    "test/test_helper.rb",
-    "test/wicked_test.rb",
-    "wicked.gemspec"
-  ]
-  s.homepage = "http://github.com/schneems/wicked"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Use Wicked to turn your controller into a wizard"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.7"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, ["~> 1.1.2"])
-      s.add_development_dependency(%q<launchy>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 1.3.0.beta"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.0.7"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<capybara>, ["~> 1.1.2"])
-      s.add_dependency(%q<launchy>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 1.3.0.beta"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.0.7"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<capybara>, ["~> 1.1.2"])
-    s.add_dependency(%q<launchy>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 1.3.0.beta"])
-  end
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  gem.add_dependency             "railties", [">= 3.0.7"]
+  gem.add_development_dependency "rails",    [">= 3.0.7"]
+  gem.add_development_dependency "capybara", [">= 0"]
+  gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "test-unit"
 end
-