bootstrap_it 0.1.1 → 0.1.2

data/spec/view_helpers/form_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Input do
-  it { expect(helper).to render_with 'input.form-control[@type="text"]' }
+  it { expect(helper.render).to have_tag 'input.form-control[@type="text"]' }
 
   it 'accepts valid input types' do
-    expect(helper type: 'password').to render_with(
+    expect(helper(type: 'password').render).to have_tag(
       'input.form-control[@type="password"]'
     )
   end
 
   it 'accepts string arguments as values' do
-    expect(helper {'10'}).to render_with 'input.form-control[@value="10"]'
+    expect(helper {'10'}.render).to have_tag 'input.form-control[@value="10"]'
   end
 end
 
 describe BootstrapIt::ViewHelpers::Form do
-  it { expect(helper).to render_with 'form[@role="form"]' }
+  it { expect(helper.render).to have_tag 'form[@role="form"]' }
 
   # kind
   it 'has `kind` enum' do

data/spec/view_helpers/grid_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Grid do
-  it { expect(helper).to render_with 'div.container' }
+  it { expect(helper.render).to have_tag 'div.container' }
 
   it 'renders child rows' do
     expect(BootstrapIt::ViewHelpers::GridRow).to receive(:new).and_call_original
@@ -10,7 +10,7 @@ describe BootstrapIt::ViewHelpers::Grid do
 end
 
 describe BootstrapIt::ViewHelpers::GridRow do
-  it { expect(helper).to render_with 'div.row' }
+  it { expect(helper.render).to have_tag 'div.row' }
 
   it 'renders child cells' do
     expect(BootstrapIt::ViewHelpers::GridCell).to receive(:new).and_call_original
@@ -18,13 +18,13 @@ describe BootstrapIt::ViewHelpers::GridRow do
   end
 
   it 'renders clearfix' do
-    expect(helper { |h| h.clear }).to render_with(
+    expect(helper { |h| h.clear }.render).to have_tag(
       'div.row > div.clearfix.visible-md'
     )
   end
 
   it 'renders clearfix with custom attributes' do
-    expect(helper { |h| h.clear :hidden_large }).to render_with(
+    expect(helper { |h| h.clear :hidden_large }.render).to have_tag(
       'div.row > div.clearfix.hidden-lg'
     )
   end
@@ -34,7 +34,7 @@ describe BootstrapIt::ViewHelpers::GridRow do
 end
 
 describe BootstrapIt::ViewHelpers::GridCell do
-  it { expect(helper).to render_with 'div.col-md-3' }
+  it { expect(helper.render).to have_tag 'div.col-md-3' }
 
   it 'renders child rows' do
     expect(BootstrapIt::ViewHelpers::GridRow).to receive(:new).and_call_original

data/spec/view_helpers/icon_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Icon do
-  it { expect(helper).to render_with 'i.fa-asterisk' }
-  it { expect(helper :bell).to render_with 'i.fa-bell' }
+  it { expect(helper.render).to have_tag 'i.fa-asterisk' }
+  it { expect(helper(:bell).render).to have_tag 'i.fa-bell' }
 end

data/spec/view_helpers/list_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::ListItem do
-  it { expect(helper).to render_with 'li' }
+  it { expect(helper.render).to have_tag 'li' }
   it { expect(helper).to be_kind_of BootstrapIt::ViewHelpers::Disableable }
   it { expect(helper).to be_kind_of WrapIt::TextContainer }
 end
@@ -9,28 +9,28 @@ end
 describe BootstrapIt::ViewHelpers::ListLinkItem do
   it { expect(helper).to be_kind_of WrapIt::Link }
 
-  it { expect(helper).to render_with 'li > a' }
+  it { expect(helper.render).to have_tag 'li > a' }
 
   it 'passes `li` or `li_options` as options to li' do
     %i(li li_options).each do |key|
       @helper = nil
-      expect(helper(key => {class: 'list'})).to render_with 'li.list > a'
+      expect(helper(key => {class: 'list'}).render).to have_tag 'li.list > a'
     end
   end
 
   it 'passes `li_*` options to li' do
-    expect(helper(li_class: 'list')).to render_with 'li.list > a'
+    expect(helper(li_class: 'list').render).to have_tag 'li.list > a'
   end
 
   it 'passes `li_*` arguments to li' do
-    expect(helper(:li_active)).to render_with 'li.active > a'
+    expect(helper(:li_active).render).to have_tag 'li.active > a'
   end
 
   it 'passes `active` and `disable` arguments to li' do
     %i(active disabled disable).each do |key|
       @helper = nil
       html_class = key == :disable ? :disabled : key
-      expect(helper(key)).to render_with "li.#{html_class} > a"
+      expect(helper(key).render).to have_tag "li.#{html_class} > a"
     end
   end
 
@@ -38,13 +38,13 @@ describe BootstrapIt::ViewHelpers::ListLinkItem do
     %i(active disabled disable).each do |key|
       @helper = nil
       html_class = key == :disable ? :disabled : key
-      expect(helper(key => true)).to render_with "li.#{html_class} > a"
+      expect(helper(key => true).render).to have_tag "li.#{html_class} > a"
     end
   end
 
   it 'keeps not related to list optioins and arguments' do
     expect(
-      helper('text', 'url', li_class: 'list', class: 'link')
-    ).to render_with 'li.list > a.link[@href="url"][text()="text"]'
+      helper('text', 'url', li_class: 'list', class: 'link').render
+    ).to have_tag 'li.list > a.link[@href="url"][text()="text"]'
   end
 end

data/spec/view_helpers/misc_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Jumbotron do
-  it { expect(helper).to render_with 'div.jumbotron' }
+  it { expect(helper.render).to have_tag 'div.jumbotron' }
 
   # full_width
   it { expect(helper).to have_flag :full_width }
   it 'makes full width jumbotron' do
-    expect(helper :full_width).to render_with 'div.jumbotron > div.container'
+    expect(helper(:full_width).render).to have_tag 'div.jumbotron > div.container'
   end
 end
 
 describe BootstrapIt::ViewHelpers::PageHeader do
-  it { expect(helper).to render_with 'div.page-header' }
+  it { expect(helper.render).to have_tag 'div.page-header' }
 end
 
 describe BootstrapIt::ViewHelpers::Alert do
-  it { expect(helper).to render_with 'div.alert.alert-success' }
+  it { expect(helper.render).to have_tag 'div.alert.alert-success' }
 
   # behaviour
   it { expect(helper).to be_kind_of WrapIt::TextContainer }
@@ -35,7 +35,7 @@ describe BootstrapIt::ViewHelpers::Alert do
       .with(html_class: ['alert-dismissable'])
   end
   it 'renders dismissable alert with button' do
-    expect(helper(:dismissable, 'Some text')).to render_with(
+    expect(helper(:dismissable, 'Some text').render).to have_tag(
       'div.alert.alert-success.alert-dismissable[text()="Some text"]' \
       ' > button.close[@type="button"][@data-dismiss="alert"]' \
       '[@aria-hidden="true"]'
@@ -44,7 +44,7 @@ describe BootstrapIt::ViewHelpers::Alert do
 
   # links
   it 'renders link with alert-link class' do
-    expect(helper { |h| h.link 'test', 'url' }).to render_with(
+    expect(helper { |h| h.link 'test', 'url' }.render).to have_tag(
       'div.alert.alert-success' \
       ' > a.alert-link[@href="url"][text()="test"]'
     )
@@ -55,7 +55,7 @@ end
 
 describe BootstrapIt::ViewHelpers::ProgressBar do
   it 'renders with all needed atrributes' do
-    expect(helper).to render_with(
+    expect(helper.render).to have_tag(
       'div.progress-bar[@role="progressbar"][@aria-valuenow="0"]' \
       '[@aria-valuemin="0"][@aria-valuemax="100"][@style="width: 0%"]' \
       ' > span.sr-only[text()="0% Complete"]'
@@ -64,14 +64,14 @@ describe BootstrapIt::ViewHelpers::ProgressBar do
 
   # custom text
   it 'renders with custom text' do
-    expect(helper('custom text')).to render_with(
+    expect(helper('custom text').render).to have_tag(
       'div.progress-bar > span.sr-only[text()="custom text"]'
     )
   end
 
   # complete
   it 'accepts integer arguments as complete percents' do
-    expect(helper(60)).to render_with(
+    expect(helper(60).render).to have_tag(
       'div.progress-bar[@aria-valuenow="60"][@style="width: 60%"]' \
       ' > span.sr-only[text()="60% Complete"]'
     )
@@ -91,7 +91,7 @@ end
 
 describe BootstrapIt::ViewHelpers::Progress do
   it 'renders with all needed atrributes' do
-    expect(helper).to render_with(
+    expect(helper.render).to have_tag(
       'div.progress > div.progress-bar[@role="progressbar"]' \
       '[@aria-valuenow="0"][@aria-valuemin="0"][@aria-valuemax="100"]' \
       '[@style="width: 0%"] > span.sr-only[text()="0% Complete"]'
@@ -109,7 +109,7 @@ describe BootstrapIt::ViewHelpers::Progress do
 
   # second bar
   it 'renders second bar' do
-    expect(helper(10) { |h| h.bar 30 }).to render_with(
+    expect(helper(10) { |h| h.bar 30 }.render).to have_tag(
       'div.progress > div.progress-bar[@aria-valuenow="10"]' \
       ' + div.progress-bar[@aria-valuenow="30"]'
     )

data/spec/view_helpers/mixin_spec.rb

@@ -7,9 +7,9 @@ describe BootstrapIt::ViewHelpers::Contextual do
   it 'sets state class' do
     %i(active success warning danger).each do |state|
       @wrapper = nil
-      expect(wrapper state).to render_with "div.#{state}"
+      expect(wrapper(state).render).to have_tag "div.#{state}"
       @wrapper = nil
-      expect(wrapper state: state).to render_with "div.#{state}"
+      expect(wrapper(state: state).render).to have_tag "div.#{state}"
     end
   end
 end
@@ -27,50 +27,55 @@ describe BootstrapIt::ViewHelpers::SizableColumn do
   it 'sanitize extra small classes' do
     %i(col_xs_2 xs_2 xs2 extra_small_2 extrasmall2).each do |c|
       @wrapper = nil
-      expect(wrapper c).to render_with 'div.col-xs-2'
+      expect(wrapper(c).render).to have_tag 'div.col-xs-2'
       @wrapper = nil
       wrapper.column_size = c
-      expect(wrapper).to render_with 'div.col-xs-2'
+      expect(wrapper.render).to have_tag 'div.col-xs-2'
     end
   end
 
   it 'sanitize small classes' do
     %i(col_sm_2 sm_2 sm2 small_2 small2).each do |c|
       @wrapper = nil
-      expect(wrapper c).to render_with 'div.col-sm-2'
+      expect(wrapper(c).render).to have_tag 'div.col-sm-2'
       @wrapper = nil
       wrapper.column_size = c
-      expect(wrapper).to render_with 'div.col-sm-2'
+      expect(wrapper.render).to have_tag 'div.col-sm-2'
     end
   end
 
   it 'sanitize medium classes' do
     %i(col_md_2 md_2 md2 medium_2 medium2).each do |c|
       @wrapper = nil
-      expect(wrapper c).to render_with 'div.col-md-2'
+      expect(wrapper(c).render).to have_tag 'div.col-md-2'
       @wrapper = nil
       wrapper.column_size = c
-      expect(wrapper).to render_with 'div.col-md-2'
+      expect(wrapper.render).to have_tag 'div.col-md-2'
     end
   end
 
   it 'sanitize large classes' do
     %i(col_lg_2 lg_2 lg2 large_2 large2).each do |c|
       @wrapper = nil
-      expect(wrapper c).to render_with 'div.col-lg-2'
+      expect(wrapper(c).render).to have_tag 'div.col-lg-2'
       @wrapper = nil
       wrapper.column_size = c
-      expect(wrapper).to render_with 'div.col-lg-2'
+      expect(wrapper.render).to have_tag 'div.col-lg-2'
     end
   end
 
   it '#column_size= accepts sizes as array' do
     wrapper.column_size = [:xs_2, :md_4]
-    expect(wrapper).to render_with 'div.col-xs-2.col-md-4'
+    expect(wrapper.render).to have_tag 'div.col-xs-2.col-md-4'
   end
 
-  it { expect(wrapper :sm3, :sm1).to render_with 'div[@class="col-sm-3"]' }
-  it { expect(wrapper :sm12, :lg1).to render_with 'div.col-sm-12.col-lg-1' }
+  it 'omits second same size' do
+    expect(wrapper(:sm3, :sm1).render).to have_tag 'div[@class="col-sm-3"]'
+  end
+
+  it 'combines differ size types' do
+    expect(wrapper(:sm12, :lg1).render).to have_tag 'div.col-sm-12.col-lg-1'
+  end
 end
 
 describe BootstrapIt::ViewHelpers::PlacableColumn do
@@ -91,10 +96,10 @@ describe BootstrapIt::ViewHelpers::PlacableColumn do
       %I(col_xs_#{act}_2 xs_#{act}_2 extra_small_#{act}_2
          extrasmall#{act}2).each do |c|
         @wrapper = nil
-        expect(wrapper c).to render_with "div.col-xs-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-xs-#{act}-2"
         @wrapper = nil
         wrapper.column_place = c
-        expect(wrapper c).to render_with "div.col-xs-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-xs-#{act}-2"
       end
     end
 
@@ -102,10 +107,10 @@ describe BootstrapIt::ViewHelpers::PlacableColumn do
       %I(col_sm_#{act}_2 sm_#{act}_2 sm#{act}2 small_#{act}_2
          small#{act}2).each do |c|
         @wrapper = nil
-        expect(wrapper c).to render_with "div.col-sm-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-sm-#{act}-2"
         @wrapper = nil
         wrapper.column_place = c
-        expect(wrapper c).to render_with "div.col-sm-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-sm-#{act}-2"
       end
     end
 
@@ -113,10 +118,10 @@ describe BootstrapIt::ViewHelpers::PlacableColumn do
       %I(col_md_#{act}_2 md_#{act}_2 md#{act}2 medium_#{act}_2
          medium#{act}2).each do |c|
         @wrapper = nil
-        expect(wrapper c).to render_with "div.col-md-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-md-#{act}-2"
         @wrapper = nil
         wrapper.column_place = c
-        expect(wrapper c).to render_with "div.col-md-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-md-#{act}-2"
       end
     end
 
@@ -124,10 +129,10 @@ describe BootstrapIt::ViewHelpers::PlacableColumn do
       %I(col_lg_#{act}_2 lg_#{act}_2 lg#{act}2 large_#{act}_2
          large#{act}2).each do |c|
         @wrapper = nil
-        expect(wrapper c).to render_with "div.col-lg-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-lg-#{act}-2"
         @wrapper = nil
         wrapper.column_place = c
-        expect(wrapper c).to render_with "div.col-lg-#{act}-2"
+        expect(wrapper(c).render).to have_tag "div.col-lg-#{act}-2"
       end
     end
   end
@@ -139,34 +144,40 @@ end
 
 describe BootstrapIt::ViewHelpers::Disableable do
   it { expect(wrapper).to have_flag(:disabled).with(aliases: [:disable]) }
-  it { expect(wrapper).to_not render_with '.disabled' }
-  it { expect(wrapper :disabled).to render_with '.disabled' }
-  it { expect(wrapper tag: :button).to_not render_with '[@disabled]' }
-  it { expect(wrapper :disabled, tag: :button).to render_with '[@disabled]' }
-  it { expect(wrapper :disabled, tag: :button).to_not render_with '.disabled' }
+  it { expect(wrapper.render).to_not have_tag '.disabled' }
+  it { expect(wrapper(:disabled).render).to have_tag '.disabled' }
+  it { expect(wrapper(tag: :button).render).to_not have_tag '[@disabled]' }
+
+  it 'includes disabled attr to buttons' do
+    expect(wrapper(:disabled, tag: :button).render).to have_tag '[@disabled]'
+  end
+
+  it 'avoid disabled class for buttons' do
+    expect(wrapper(:disabled, tag: :button).render).to_not have_tag '.disabled'
+  end
 end
 
 describe BootstrapIt::ViewHelpers::Sizable do
-  it { expect(wrapper :lg).to render_with '.lg' }
-  it { expect(wrapper :large).to render_with '.lg' }
-  it { expect(wrapper :sm).to render_with '.sm' }
-  it { expect(wrapper :small).to render_with '.sm' }
-  it { expect(wrapper :xs).to render_with '.xs' }
-  it { expect(wrapper :extrasmall).to render_with '.xs' }
-  it { expect(wrapper :extra_small).to render_with '.xs' }
-  it { expect(wrapper size: :large).to render_with '.lg' }
-  it { expect(wrapper :small, size: :large).to render_with '.sm' }
+  it { expect(wrapper(:lg).render).to have_tag '.lg' }
+  it { expect(wrapper(:large).render).to have_tag '.lg' }
+  it { expect(wrapper(:sm).render).to have_tag '.sm' }
+  it { expect(wrapper(:small).render).to have_tag '.sm' }
+  it { expect(wrapper(:xs).render).to have_tag '.xs' }
+  it { expect(wrapper(:extrasmall).render).to have_tag '.xs' }
+  it { expect(wrapper(:extra_small).render).to have_tag '.xs' }
+  it { expect(wrapper(size: :large).render).to have_tag '.lg' }
+  it { expect(wrapper(:small, size: :large).render).to have_tag '.sm' }
 
   it 'adds class prefix' do
     wrapper_class.class_eval do
       html_class_prefix 'btn-'
     end
     @wrapper = nil
-    expect(wrapper :lg).to render_with '.btn-lg'
+    expect(wrapper(:lg).render).to have_tag '.btn-lg'
     @wrapper = nil
-    expect(wrapper :btn_lg).to render_with '.btn-lg'
+    expect(wrapper(:btn_lg).render).to have_tag '.btn-lg'
     @wrapper = nil
-    expect(wrapper :btn_large).to render_with '.btn-lg'
+    expect(wrapper(:btn_large).render).to have_tag '.btn-lg'
   end
 
   it { expect(wrapper size: 'value').to_not have_option :size }

data/spec/view_helpers/nav_spec.rb

@@ -1,19 +1,21 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Nav do
-  it { expect(helper).to render_with 'ul.nav' }
+  it { expect(helper.render).to have_tag 'ul.nav' }
 
   it { expect(helper).to be_kind_of BootstrapIt::ViewHelpers::Justifable }
-  it { expect(helper).to be_kind_of WrapIt::Container }
+  it { expect(helper).to be_kind_of WrapIt::Base }
 
   it 'renders active links' do
-    expect(helper { |h| h.link_item :active }).to render_with 'ul > li.active'
+    expect(helper { |h| h.link_item :active }.render).to have_tag(
+      'ul > li.active'
+    )
   end
 
   it 'renders dropdowns' do
     expect(
-      helper { |h| h.dropdown('text') { |d| d.header 'header' } }
-    ).to render_with(
+      helper { |h| h.dropdown('text') { |d| d.header 'header' } }.render
+    ).to have_tag(
       'ul > li.dropdown' \
       ' > a.dropdown-toggle[@data-toggle="dropdown"]' \
       '[@href="#"][text()="text "]'
@@ -23,27 +25,29 @@ end
 
 describe BootstrapIt::ViewHelpers::NavPills do
   it { expect(helper).to be_kind_of BootstrapIt::ViewHelpers::Nav }
-  it { expect(helper).to render_with 'ul.nav.nav-pills' }
+  it { expect(helper.render).to have_tag 'ul.nav.nav-pills' }
 end
 
 describe BootstrapIt::ViewHelpers::NavTabs do
   it { expect(helper).to be_kind_of BootstrapIt::ViewHelpers::Nav }
-  it { expect(helper).to render_with 'ul.nav.nav-tabs' }
+  it { expect(helper.render).to have_tag 'ul.nav.nav-tabs' }
 end
 
 describe BootstrapIt::ViewHelpers::NavBar do
   it 'renders with all needed options' do
-    expect(helper).to render_with(
+    expect(helper.render).to have_tag(
       'nav.navbar.navbar-default[@role="navigation"]'
     )
   end
 
   it 'renders with button' do
-    expect(helper { |h| h.button }).to render_with 'nav > button.navbar-btn'
+    expect(helper { |h| h.button }.render).to have_tag(
+      'nav > button.navbar-btn'
+    )
   end
 
   it 'renders with text' do
-    expect(helper { |h| h.text 'some text' }).to render_with(
+    expect(helper { |h| h.text 'some text' }.render).to have_tag(
       'nav > p.navbar-text', text: 'some text'
     )
   end