padrino-helpers 0.12.9 → 0.13.0.beta1

data/test/test_rendering.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'slim'
-require 'liquid'
 
 describe "Rendering" do
   def setup
@@ -88,26 +87,6 @@ describe "Rendering" do
       assert_equal "js file", body
     end
 
-    it 'should set and restore layout in controllers' do
-      create_layout :boo, "boo is a <%= yield %>"
-      create_layout :moo, "moo is a <%= yield %>"
-      create_view :foo, "liquid file", :format => :liquid
-      mock_app do
-        layout :boo
-        controller :moo do
-          layout :moo
-          get('/liquid') { render :foo }
-        end
-        controller :boo do
-          get('/liquid') { render :foo }
-        end
-      end
-      get "/moo/liquid"
-      assert_equal "moo is a liquid file", body
-      get "/boo/liquid"
-      assert_equal "boo is a liquid file", body
-    end
-
     it 'should use correct layout for each format' do
       create_layout :application, "this is an <%= yield %>"
       create_layout :application, "document start <%= yield %> end", :format => :xml
@@ -137,32 +116,6 @@ describe "Rendering" do
       assert_equal "html file", body
     end
 
-    it 'should find proper templates when content_type is set by string' do
-      create_layout :error, "layout<%= yield %>"
-      create_view :e404, "404 file"
-
-      mock_app do
-        not_found do
-          content_type 'text/html'
-          render 'e404', :layout => :error
-        end
-      end
-      get '/missing'
-      assert_equal 'layout404 file', body
-    end
-
-    it 'should work with set content type not contained in rack-types' do
-      create_view "index.md.erb", "Hello"
-      mock_app do
-        get("/") {
-          content_type "text/x-markdown; charset=UTF-8"
-          render "index.erb", { :layout => nil }
-        }
-      end
-      get "/"
-      assert_equal "Hello", body
-    end
-
     it 'should not use html file when DEFAULT_RENDERING_OPTIONS[:strict_format] == true' do
       create_layout :foo, "html file", :format => :html
 
@@ -689,7 +642,7 @@ describe "Rendering" do
       class Application < Sinatra::Base
         register Padrino::Rendering
         get '/' do
-          render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog'
+          render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog' 
         end
       end
       @app = Application.new
@@ -750,14 +703,4 @@ describe "Rendering" do
       assert_equal "application/xml;charset=utf-8", response['Content-Type']
     end
   end
-
-  describe 'rendering with helpers that use render' do
-    %W{erb haml slim}.each do |engine|
-      it "should work with #{engine}" do
-        @app = RenderDemo
-        get "/double_dive_#{engine}"
-        assert_response_has_tag '.outer .wrapper form .inner .core'
-      end
-    end
-  end
 end

data/test/test_tag_helpers.rb

@@ -8,29 +8,27 @@ describe "TagHelpers" do
 
   describe 'for #tag method' do
     it 'should support tags with no content no attributes' do
-      assert_html_has_tag(tag(:br), :br)
+      assert_has_tag(:br) { tag(:br) }
     end
 
     it 'should support tags with no content with attributes' do
       actual_html = tag(:br, :style => 'clear:both', :class => 'yellow')
-      assert_html_has_tag(actual_html, :br, :class => 'yellow', :style=>'clear:both')
+      assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html }
     end
 
     it 'should support selected attribute by using "selected" if true' do
       actual_html = tag(:option, :selected => true)
-      # fix nokogiri 1.6.8 on jRuby
-      actual_html = content_tag(:select, actual_html)
-      assert_html_has_tag(actual_html, 'option', :selected => 'selected')
+      assert_has_tag('option', :selected => 'selected') { actual_html }
     end
 
     it 'should support data attributes' do
       actual_html = tag(:a, :data => { :remote => true, :method => 'post'})
-      assert_html_has_tag(actual_html, :a, 'data-remote' => 'true', 'data-method' => 'post')
+      assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html }
     end
 
     it 'should support nested attributes' do
       actual_html = tag(:div, :data => {:dojo => {:type => 'dijit.form.TextBox', :props => 'readOnly: true'}})
-      assert_html_has_tag(actual_html, :div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true')
+      assert_has_tag(:div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true') { actual_html }
     end
 
     it 'should support open tags' do
@@ -47,87 +45,87 @@ describe "TagHelpers" do
   describe 'for #content_tag method' do
     it 'should support tags with content as parameter' do
       actual_html = content_tag(:p, "Demo", :class => 'large', :id => 'thing')
-      assert_html_has_tag(actual_html, 'p.large#thing', :content => "Demo")
+      assert_has_tag('p.large#thing', :content => "Demo") { actual_html }
     end
 
     it 'should support tags with content as block' do
       actual_html = content_tag(:p, :class => 'large', :id => 'star') { "Demo" }
-      assert_html_has_tag(actual_html, 'p.large#star', :content => "Demo")
+      assert_has_tag('p.large#star', :content => "Demo") { actual_html }
     end
 
     it 'should escape non-html-safe content' do
       actual_html = content_tag(:p, :class => 'large', :id => 'star') { "<>" }
-      assert_html_has_tag(actual_html, 'p.large#star')
+      assert_has_tag('p.large#star') { actual_html }
       assert_match('&lt;&gt;', actual_html)
     end
 
     it 'should not escape html-safe content' do
       actual_html = content_tag(:p, :class => 'large', :id => 'star') { "<>" }
-      assert_html_has_tag(actual_html, 'p.large#star', :content => "<>")
+      assert_has_tag('p.large#star', :content => "<>") { actual_html }
     end
 
     it 'should convert to a string if the content is not a string' do
       actual_html = content_tag(:p, 97)
-      assert_html_has_tag(actual_html, 'p', :content => "97")
+      assert_has_tag('p', :content => "97") { actual_html }
     end
 
     it 'should support tags with erb' do
-      get "/erb/content_tag"
-      assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1'
-      assert_response_has_tag :p, :content => "Test 2"
-      assert_response_has_tag :p, :content => "Test 3"
-      assert_response_has_tag :p, :content => "Test 4"
-      assert_response_has_tag :p, :content => "one"
-      assert_response_has_tag :p, :content => "two"
-      assert_response_has_no_tag :p, :content => "failed"
+      visit '/erb/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3"
+      assert_have_selector :p, :content => "Test 4"
+      assert_have_selector :p, :content => "one"
+      assert_have_selector :p, :content => "two"
+      assert_have_no_selector :p, :content => "failed"
     end
 
     it 'should support tags with haml' do
-      get "/haml/content_tag"
-      assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1'
-      assert_response_has_tag :p, :content => "Test 2"
-      assert_response_has_tag :p, :content => "Test 3", :class => 'test', :id => 'test3'
-      assert_response_has_tag :p, :content => "Test 4"
-      assert_response_has_tag :p, :content => "one"
-      assert_response_has_tag :p, :content => "two"
-      assert_response_has_no_tag :p, :content => "failed"
+      visit '/haml/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_have_selector :p, :content => "Test 4"
+      assert_have_selector :p, :content => "one"
+      assert_have_selector :p, :content => "two"
+      assert_have_no_selector :p, :content => "failed"
     end
 
     it 'should support tags with slim' do
-      get "/slim/content_tag"
-      assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1'
-      assert_response_has_tag :p, :content => "Test 2"
-      assert_response_has_tag :p, :content => "Test 3", :class => 'test', :id => 'test3'
-      assert_response_has_tag :p, :content => "Test 4"
-      assert_response_has_tag :p, :content => "one"
-      assert_response_has_tag :p, :content => "two"
-      assert_response_has_no_tag :p, :content => "failed"
+      visit '/slim/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_have_selector :p, :content => "Test 4"
+      assert_have_selector :p, :content => "one"
+      assert_have_selector :p, :content => "two"
+      assert_have_no_selector :p, :content => "failed"
     end
   end
 
   describe 'for #input_tag method' do
     it 'should support field with type' do
-      assert_html_has_tag(input_tag(:text), 'input[type=text]')
+      assert_has_tag('input[type=text]') { input_tag(:text) }
     end
 
     it 'should support field with type and options' do
       actual_html = input_tag(:text, :class => "first", :id => 'texter')
-      assert_html_has_tag(actual_html, 'input.first#texter[type=text]')
+      assert_has_tag('input.first#texter[type=text]') { actual_html }
     end
 
     it 'should support checked attribute by using "checked" if true' do
       actual_html = input_tag(:checkbox, :checked => true)
-      assert_html_has_tag(actual_html, 'input[type=checkbox]', :checked => 'checked')
+      assert_has_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
     end
 
     it 'should remove checked attribute if false' do
       actual_html = input_tag(:checkbox, :checked => false)
-      assert_html_has_no_tag(actual_html, 'input[type=checkbox][checked=false]')
+      assert_has_no_tag('input[type=checkbox][checked=false]') { actual_html }
     end
 
     it 'should support disabled attribute by using "disabled" if true' do
       actual_html = input_tag(:checkbox, :disabled => true)
-      assert_html_has_tag(actual_html, 'input[type=checkbox]', :disabled => 'disabled')
+      assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,62 +19,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS40LjE=
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mw==
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS40LjE=
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mw==
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC42
-    - - ! '>='
+        version: '0.6'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC42Ljc=
+        version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC42
-    - - ! '>='
+        version: '0.6'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC42Ljc=
+        version: 0.6.7
 description: Tag helpers, asset helpers, form helpers, form builders and many more
   helpers for padrino
 email: padrinorb@gmail.com
@@ -92,7 +78,6 @@ files:
 - lib/padrino-helpers.rb
 - lib/padrino-helpers/asset_tag_helpers.rb
 - lib/padrino-helpers/form_builder/abstract_form_builder.rb
-- lib/padrino-helpers/form_builder/deprecated_builder_methods.rb
 - lib/padrino-helpers/form_builder/standard_form_builder.rb
 - lib/padrino-helpers/form_helpers.rb
 - lib/padrino-helpers/form_helpers/errors.rb
@@ -244,18 +229,117 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.6.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Helpers for padrino
-test_files: []
+test_files:
+- test/fixtures/apps/.components
+- test/fixtures/apps/.gitignore
+- test/fixtures/apps/render.rb
+- test/fixtures/apps/views/article/comment/show.slim
+- test/fixtures/apps/views/blog/post.erb
+- test/fixtures/apps/views/layouts/specific.erb
+- test/fixtures/apps/views/test/post.erb
+- test/fixtures/layouts/layout.erb
+- test/fixtures/markup_app/app.rb
+- test/fixtures/markup_app/views/button_to.erb
+- test/fixtures/markup_app/views/button_to.haml
+- test/fixtures/markup_app/views/button_to.slim
+- test/fixtures/markup_app/views/capture_concat.erb
+- test/fixtures/markup_app/views/capture_concat.haml
+- test/fixtures/markup_app/views/capture_concat.slim
+- test/fixtures/markup_app/views/content_for.erb
+- test/fixtures/markup_app/views/content_for.haml
+- test/fixtures/markup_app/views/content_for.slim
+- test/fixtures/markup_app/views/content_tag.erb
+- test/fixtures/markup_app/views/content_tag.haml
+- test/fixtures/markup_app/views/content_tag.slim
+- test/fixtures/markup_app/views/current_engine.erb
+- test/fixtures/markup_app/views/current_engine.haml
+- test/fixtures/markup_app/views/current_engine.slim
+- test/fixtures/markup_app/views/fields_for.erb
+- test/fixtures/markup_app/views/fields_for.haml
+- test/fixtures/markup_app/views/fields_for.slim
+- test/fixtures/markup_app/views/form_for.erb
+- test/fixtures/markup_app/views/form_for.haml
+- test/fixtures/markup_app/views/form_for.slim
+- test/fixtures/markup_app/views/form_tag.erb
+- test/fixtures/markup_app/views/form_tag.haml
+- test/fixtures/markup_app/views/form_tag.slim
+- test/fixtures/markup_app/views/link_to.erb
+- test/fixtures/markup_app/views/link_to.haml
+- test/fixtures/markup_app/views/link_to.slim
+- test/fixtures/markup_app/views/mail_to.erb
+- test/fixtures/markup_app/views/mail_to.haml
+- test/fixtures/markup_app/views/mail_to.slim
+- test/fixtures/markup_app/views/meta_tag.erb
+- test/fixtures/markup_app/views/meta_tag.haml
+- test/fixtures/markup_app/views/meta_tag.slim
+- test/fixtures/markup_app/views/partials/_erb.erb
+- test/fixtures/markup_app/views/partials/_haml.haml
+- test/fixtures/markup_app/views/partials/_slim.slim
+- test/fixtures/markup_app/views/simple_partial.erb
+- test/fixtures/markup_app/views/simple_partial.haml
+- test/fixtures/markup_app/views/simple_partial.slim
+- test/fixtures/render_app/app.rb
+- test/fixtures/render_app/views/_deep.erb
+- test/fixtures/render_app/views/_deep.haml
+- test/fixtures/render_app/views/_deep.slim
+- test/fixtures/render_app/views/_partial_block_erb.erb
+- test/fixtures/render_app/views/_partial_block_haml.haml
+- test/fixtures/render_app/views/_partial_block_slim.slim
+- test/fixtures/render_app/views/_unsafe.html.builder
+- test/fixtures/render_app/views/_unsafe_object.html.builder
+- test/fixtures/render_app/views/current_engine.haml
+- test/fixtures/render_app/views/current_engines/_erb.erb
+- test/fixtures/render_app/views/current_engines/_haml.haml
+- test/fixtures/render_app/views/current_engines/_slim.slim
+- test/fixtures/render_app/views/dive_inner_erb.erb
+- test/fixtures/render_app/views/dive_inner_haml.haml
+- test/fixtures/render_app/views/dive_inner_slim.slim
+- test/fixtures/render_app/views/dive_outer_erb.erb
+- test/fixtures/render_app/views/dive_outer_haml.haml
+- test/fixtures/render_app/views/dive_outer_slim.slim
+- test/fixtures/render_app/views/double_capture_erb.erb
+- test/fixtures/render_app/views/double_capture_haml.haml
+- test/fixtures/render_app/views/double_capture_slim.slim
+- test/fixtures/render_app/views/erb/test.erb
+- test/fixtures/render_app/views/explicit_engine.haml
+- test/fixtures/render_app/views/haml/test.haml
+- test/fixtures/render_app/views/render_block_erb.erb
+- test/fixtures/render_app/views/render_block_haml.haml
+- test/fixtures/render_app/views/render_block_slim.slim
+- test/fixtures/render_app/views/ruby_block_capture_erb.erb
+- test/fixtures/render_app/views/ruby_block_capture_haml.haml
+- test/fixtures/render_app/views/ruby_block_capture_slim.slim
+- test/fixtures/render_app/views/template/_user.haml
+- test/fixtures/render_app/views/template/haml_template.haml
+- test/fixtures/render_app/views/template/some_template.haml
+- test/fixtures/render_app/views/wrong_capture_erb.erb
+- test/fixtures/render_app/views/wrong_capture_haml.haml
+- test/fixtures/render_app/views/wrong_capture_slim.slim
+- test/helper.rb
+- test/test_asset_tag_helpers.rb
+- test/test_form_builder.rb
+- test/test_form_helpers.rb
+- test/test_format_helpers.rb
+- test/test_helpers.rb
+- test/test_locale.rb
+- test/test_number_helpers.rb
+- test/test_output_helpers.rb
+- test/test_render_helpers.rb
+- test/test_rendering.rb
+- test/test_rendering_extensions.rb
+- test/test_tag_helpers.rb
+has_rdoc: