Skip to content

Commit

Permalink
Merge branch 'master' into 0.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jodosha committed Jun 23, 2016
2 parents 194a3d3 + b534567 commit fd8c0c8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
6 changes: 5 additions & 1 deletion Gemfile
@@ -1,12 +1,16 @@
source 'https://rubygems.org'
gemspec


unless ENV['TRAVIS']
gem 'byebug', require: false, platforms: :mri
gem 'yard', require: false
end

# This is required until dry-validation 0.8 will be out
gem 'dry-types', require: false, github: 'dry-rb/dry-types'
gem 'dry-logic', require: false, github: 'dry-rb/dry-logic'
gem 'dry-validation', require: false, github: 'dry-rb/dry-validation'

gem 'hanami-utils', '~> 0.8', github: 'hanami/utils', branch: '0.8.x'
gem 'hanami-validations', '~> 0.6', github: 'hanami/validations', branch: '0.6.x'
gem 'hanami-controller', '~> 0.7', github: 'hanami/controller', branch: '0.7.x'
Expand Down
12 changes: 7 additions & 5 deletions test/fixtures.rb
Expand Up @@ -305,7 +305,7 @@ class FormHelperView
attr_reader :params

def initialize(params)
@params = Hanami::Action::Params.new(params)
@params = Hanami::Action::BaseParams.new(params)
end
end

Expand Down Expand Up @@ -339,10 +339,12 @@ def initialize(attributes = {})
end

class DeliveryParams < Hanami::Action::Params
param :delivery do
param :customer_id, type: Integer, presence: true
param :address do
param :street, type: String, presence: true
params do
required(:delivery).schema do
required(:customer_id, :int).filled
required(:address).schema do
required(:street, :string).filled
end
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/integration/form_helper_test.rb
Expand Up @@ -7,7 +7,7 @@

describe 'form with huge ERB block' do
before do
@params = Hanami::Action::Params.new({})
@params = Hanami::Action::BaseParams.new({})
@session = Session.new(_csrf_token: 'l23')
@actual = FullStack::Views::Sessions::New.render(format: :html, params: @params, session: @session)
end
Expand Down

0 comments on commit fd8c0c8

Please sign in to comment.