twitter-bootstrap-rails 2.2.8 → 4.0.0

data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb

@@ -10,13 +10,21 @@ include BadgeLabelHelper
 
 describe BadgeLabelHelper, :type => :helper do
   it "should return a basic bootstrap badge" do
-    badge('test').gsub(/\s/, '').downcase.should eql(BASIC_BADGE.gsub(/\s/, '').downcase)
+    expect(badge('New!').gsub(/\s/, '').downcase)
+      .to eql(BASIC_BADGE.gsub(/\s/, '').downcase)
   end
 
   it "should return a bootstrap badge with class" do
-    badge('waning', :warning).gsub(/\s/, '').downcase.should eql(BADGE_WITH_CLASS.gsub(/\s/, '').downcase)
+    expect(badge('2', :warning).gsub(/\s/, '').downcase)
+      .to eql(BADGE_WITH_CLASS.gsub(/\s/, '').downcase)
+  end
+
+  it "should take a Number as its first parameter" do
+  	expect(badge(12).gsub(/\s/, '').downcase)
+  	.to eql(BADGE_WITH_NUMBER_PARAM.gsub(/\s/, '').downcase)
   end
 end
 
-BASIC_BADGE = %{<span class="badge">test</span>}
-BADGE_WITH_CLASS = %{<span class="badge badge-warning">waning</span>}
+BASIC_BADGE = %{<span class="badge">New!</span>}
+BADGE_WITH_CLASS = %{<span class="badge badge-warning">2</span>}
+BADGE_WITH_NUMBER_PARAM = %{<span class="badge">12</span>}

data/spec/lib/twitter_bootstrap_rails/bootstrap_flash_helper_spec.rb

@@ -0,0 +1,128 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require_relative '../../../app/helpers/bootstrap_flash_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include BootstrapFlashHelper
+
+describe BootstrapFlashHelper, type: :helper do
+  before do
+    allow(self).to receive(:uri_state) { :inactive }
+    allow(self).to receive(:root_url) { '/' }
+  end
+
+  describe "bootstrap_flash" do
+    it "should not return anything without flashes" do
+      allow(self).to receive(:flash) { {} }
+
+      element = bootstrap_flash
+
+      expect(element).to eql("")
+    end
+
+    it "should work with a notice" do
+      allow(self).to receive(:flash) { {notice: "Hello"} }
+
+      element = bootstrap_flash
+
+      expect(element).to have_tag(:div,
+        text: "×Hello",
+        with: {class: "alert fade in alert-success"}) {
+
+        with_tag(:button,
+          text: "×",
+          with: {
+            class: "close",
+            "data-dismiss" => "alert"
+          }
+        )
+
+      }
+    end
+
+    it "should work with a notice and an extra class" do
+      allow(self).to receive(:flash) { {notice: "Hello"} }
+
+      element = bootstrap_flash(class: "extra-class")
+
+      expect(element).to have_tag(:div,
+        text: "×Hello",
+        with: {class: "alert fade in alert-success extra-class"}) {
+
+        with_tag(:button,
+          text: "×",
+          with: {
+            class: "close",
+            "data-dismiss" => "alert"
+          }
+        )
+
+      }
+    end
+
+    it "should work with a notice and an extra class and an extra attribute" do
+      allow(self).to receive(:flash) { {notice: "Hello"} }
+
+      element = bootstrap_flash(class: "extra-class", "data-no-transition-cache" => true)
+
+      expect(element).to have_tag(:div,
+        text: "×Hello",
+        with: {
+          class: "alert fade in alert-success extra-class",
+          "data-no-transition-cache" => true
+        }) {
+
+        with_tag(:button,
+          text: "×",
+          with: {
+            class: "close",
+            "data-dismiss" => "alert"
+          }
+        )
+
+      }
+    end
+
+    it "should escape javascript if not marked as safe by user" do
+      allow(self).to receive(:flash) { {notice: "<script>alert(1)</script>"} }
+
+      element = bootstrap_flash
+
+      expect(element).to have_tag(:div,
+                                  text: "×<script>alert(1)</script>",
+                                  with: {class: "alert fade in alert-success"}) {
+                           with_tag(:button,
+                                    text: "×",
+                                    with: {
+                                        class: "close",
+                                        "data-dismiss" => "alert"
+                                    }
+                           )
+                         }
+    end
+
+    it "should not escape a link if marked as safe by user" do
+      allow(self).to receive(:flash) { {notice: "<a href='example.com'>awesome link!</a>".html_safe} }
+
+      element = bootstrap_flash
+
+      expect(element).to have_tag(:div,
+                                  text: "×awesome link!",
+                                  with: {class: "alert fade in alert-success"}) { [
+                             with_tag(:button,
+                                      text: "×",
+                                      with: {
+                                          class: "close",
+                                          "data-dismiss" => "alert"
+                                      }
+                             ),
+                             with_tag(:a,
+                                      text: 'awesome link!')
+                         ]
+                         }
+    end
+  end
+end

data/spec/lib/twitter_bootstrap_rails/form_errors_helper_spec.rb

@@ -0,0 +1,148 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require 'rspec/active_model/mocks'
+
+require_relative '../../../app/helpers/form_errors_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include FormErrorsHelper
+
+describe FormErrorsHelper, :type => :helper do
+
+  before do
+    @base_errors = ['base error message', 'nasty error']
+    @base_error = 'one base error'
+
+
+    @title_errors = ["can't be blank", 'is too short (minimum is 5 characters)']
+    @title_error = "can't be blank"
+
+    @errors = double('errors')
+    @new_post =  mock_model( 'Post' )
+    allow(@new_post).to receive_messages(:errors => @errors)
+    allow(self).to receive_messages(:post_path => '/post/1')
+    allow(self).to receive_messages(:protect_against_forgery? => false)
+    allow(self).to receive_messages(:polymorphic_path => '')
+
+    @default_class = 'help-block'
+    @default_error_class = 'has-error'
+  end
+
+
+  describe 'error[:base] is a string' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:base).and_return(@base_error)
+    end
+
+    it 'should render base error on :base key' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:base)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @base_error)
+        end
+      end
+    end
+
+  end
+
+
+  describe 'when there is only one error on base' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:base).and_return(@base_error)
+    end
+
+    it 'should render base error on :base key' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:base)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @base_error)
+        end
+      end
+    end
+
+  end
+
+  describe 'when there is only one error on title' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_error)
+    end
+
+    it 'should render base errors join with comma' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @title_error)
+        end
+      end
+    end
+  end
+
+
+
+  describe 'when there is more than one error on title' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_errors)
+    end
+
+    it 'should render base errors join with comma' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @title_errors.join(', '))
+        end
+      end
+    end
+  end
+
+
+  describe 'when there are no errors' do
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(nil)
+    end
+
+    it 'should return nil' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title)).to be_nil
+      end
+    end
+  end
+
+  describe 'when :error_class option is passed' do
+    let(:error_class) { 'has_warning' }
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_error)
+    end
+
+    it "should render with passed error class " do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title, :error_class => error_class))
+        .to have_tag("div.#{error_class}") do
+          with_tag("span.#{@default_class}", :text => @title_error)
+        end
+      end
+    end
+  end
+
+  describe 'when :error_class option is passed' do
+    let(:span_class) { 'help-inline' }
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_error)
+    end
+
+    it "should render with passed error class " do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title, :span_class => span_class))
+        .to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{span_class}", :text => @title_error)
+        end
+      end
+    end
+
+  end
+
+end

data/spec/lib/twitter_bootstrap_rails/glyph_helper_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require_relative '../../../app/helpers/glyph_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include GlyphHelper
+
+describe GlyphHelper, :type => :helper do
+  it "should return a basic bootstrap glyph" do
+    expect(glyph(:thumbs_up).gsub(/\s/, '').downcase)
+      .to eql(BASIC_GLYPH.gsub(/\s/, '').downcase)
+  end
+
+  it "should return a bootstrap glyph with span" do
+    expect(glyph(:thumbs_up, {:tag => :span}).gsub(/\s/, '').downcase)
+      .to eql(GLYPH_WITH_SPAN.gsub(/\s/, '').downcase)
+  end
+end
+
+BASIC_GLYPH = %{<iclass=\"glyphiconglyphicon-thumbs-up\"></i>}
+GLYPH_WITH_SPAN = %{<spanclass=\"glyphiconglyphicon-thumbs-up\"></span>}

data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb

@@ -11,49 +11,49 @@ describe ModalHelper, :type => :helper do
   header_without_close = { :show_close => false, :title => 'Modal header' }
   options              = { :id => "modal",
 												 	 :header => header_with_close,
-                           :body   => 'This is the body',
-                           :footer => content_tag(:button, 'Save', :class => 'btn')
+                           :body   => { content: 'This is the body' },
+                           :footer => { content: content_tag(:button, 'Save', :class => 'btn') }
   }
 
   it 'returns a complete modal' do
-    modal_dialog(options).gsub(/\n/, "").should eql BASIC_MODAL.gsub(/\n/, "")
+    expect(modal_dialog(options).gsub(/\n/, "")).to eql BASIC_MODAL.gsub(/\n/, "")
   end
 
   it 'returns a modal header with a close button if show_close is true' do
-    modal_header(header_with_close).gsub(/\n/, "").should eql MODAL_HEADER_WITH_CLOSE.gsub(/\n/, "")
+    expect(modal_header(header_with_close).gsub(/\n/, "")).to eql MODAL_HEADER_WITH_CLOSE.gsub(/\n/, "")
   end
 
   it 'renders a modal header without a close button' do
-      modal_header(header_without_close).gsub(/\n/, "").should eql MODAL_HEADER_WITHOUT_CLOSE.gsub(/\n/, "")
+    expect(modal_header(header_without_close).gsub(/\n/, "")).to eql MODAL_HEADER_WITHOUT_CLOSE.gsub(/\n/, "")
   end
 
 	it 'renders a close button' do
-		close_button('modal').should eql "<button class=\"close\" data-dismiss=\"modal\">&times;</button>"
+		expect(close_button('modal')).to eql "<button class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">&times;</button>"
 	end
 
   it 'renders a modal toggle button' do
-		modal_toggle('Save', :href => "#modal").gsub(/\n/, "").should eql MODAL_TOGGLE.gsub(/\n/, "")
+    expect(modal_toggle('Save', :href => "#modal").gsub(/\n/, "")).to eql MODAL_TOGGLE.gsub(/\n/, "")
   end
 
-	it 'renders a cancel button' do
-		modal_cancel_button("Cancel", :href => "#modal", :data => {:dismiss => 'modal'}).gsub(/\n/, "").should eql MODAL_CANCEL_BUTTON.gsub(/\n/, "")
-	end
-
+  it 'renders a cancel button' do
+    expect(modal_cancel_button("Cancel", :data => {:dismiss => 'modal'}, :href => "#modal").gsub(/\n/, "")).to eql MODAL_CANCEL_BUTTON.gsub(/\n/, "")
+  end
 end
+
 BASIC_MODAL = <<-HTML
-<div class=\"bootstrap-modal modal hide fade\" id="modal"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\">&times;</button><h3>Modal header</h3></div><div class=\"modal-body\">This is the body</div><div class=\"modal-footer\"><button class=\"btn\">Save</button></div></div>
+<div class=\"bootstrap-modal modal fade\" id=\"modal\"><div class=\"modal-dialog \"><div class=\"modal-content\"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">&times;</button><h4 class=\"modal-title\">Modal header</h4></div><div class=\"modal-body\">This is the body</div><div class=\"modal-footer\"><button class="btn">Save</button></div></div></div></div>
 HTML
 
 MODAL_HEADER_WITHOUT_CLOSE = <<-HTML
-<div class="modal-header"><h3>Modal header</h3></div>
+<div class="modal-header"><h4 class=\"modal-title\">Modal header</h4></div>
 HTML
 
 MODAL_HEADER_WITH_CLOSE = <<-HTML
-<div class="modal-header"><button class="close" data-dismiss="modal">&times;</button><h3>Modal header</h3></div>
+<div class="modal-header"><button class="close" data-dismiss="modal" aria-hidden=\"true\">&times;</button><h4 class=\"modal-title\">Modal header</h4></div>
 HTML
 
 MODAL_TOGGLE = <<-HTML
-<a class="btn" data-toggle="modal" href="#modal">Save</a>
+<a class="btn btn-default" data-toggle="modal" href="#modal">Save</a>
 HTML
 
 MODAL_CANCEL_BUTTON = <<-HTML

data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb

@@ -11,161 +11,232 @@ include NavbarHelper
 
 describe NavbarHelper, :type => :helper do
   before do
-    self.stub!("uri_state").and_return(:inactive)
-    self.stub!("root_url").and_return("/")
+    allow(self).to receive(:uri_state) { :inactive }
+    allow(self).to receive(:root_url) { '/' }
   end
   describe "nav_bar" do
     it "should return a basic bootstrap navbar" do
-      nav_bar.gsub(/\s/, '').downcase.should eql(BASIC_NAVBAR.gsub(/\s/, '').downcase)
+      expect(nav_bar.gsub(/\s/, '').downcase)
+        .to eql(BASIC_NAVBAR.gsub(/\s/, '').downcase)
     end
 
     it "should set the fixed position to top" do
-      nav_bar(:fixed => :top).gsub(/\s/, '').downcase.should eql(FIXED_TOP_NAVBAR.gsub(/\s/, '').downcase)
+      expect(nav_bar(:fixed => :top).gsub(/\s/, '').downcase)
+        .to eql(FIXED_TOP_NAVBAR.gsub(/\s/, '').downcase)
     end
 
     it "should set the static position to top" do
-      nav_bar(:static => :top).gsub(/\s/, '').downcase.should eql(STATIC_TOP_NAVBAR.gsub(/\s/, '').downcase)
+      expect(nav_bar(:static => :top).gsub(/\s/, '').downcase)
+        .to eql(STATIC_TOP_NAVBAR.gsub(/\s/, '').downcase)
     end
 
     it "should set the fixed position to bottom" do
-      nav_bar(:fixed => :bottom).gsub(/\s/, '').downcase.should eql(FIXED_BOTTOM_NAVBAR.gsub(/\s/, '').downcase)
+      expect(nav_bar(:fixed => :bottom).gsub(/\s/, '').downcase)
+        .to eql(FIXED_BOTTOM_NAVBAR.gsub(/\s/, '').downcase)
     end
 
     it "should set the style to inverse" do
-      nav_bar(:inverse => true).gsub(/\s/, '').downcase.should eql(INVERSE_NAVBAR.gsub(/\s/, '').downcase)
+      expect(nav_bar(:inverse => true).gsub(/\s/, '').downcase)
+        .to eql(INVERSE_NAVBAR.gsub(/\s/, '').downcase)
     end
 
     it "should add the brand name and link it to the home page" do
-      nav_bar(:brand => "Ninety Ten").gsub(/\s/, '').downcase.should eql(NAVBAR_WITH_BRAND.gsub(/\s/, '').downcase)
+      expect(nav_bar(:brand => "Ninety Ten").gsub(/\s/, '').downcase)
+        .to eql(NAVBAR_WITH_BRAND.gsub(/\s/, '').downcase)
     end
 
     it "should be able to set the brand link url" do
-      nav_bar(:brand => "Ninety Ten", :brand_link => "http://www.ninetyten.com").gsub(/\s/, '').downcase.should eql(NAVBAR_WITH_BRAND_AND_LINK.gsub(/\s/, '').downcase)
-    end
-
-    it "should set the container to fluid" do
-      nav_bar(:fluid => :true).gsub(/\s/, '').downcase.should eql(BASIC_NAVBAR_FLUID.gsub(/\s/, '').downcase)
+      expect(nav_bar(:brand => "Ninety Ten", :brand_link => "http://www.ninetyten.com").gsub(/\s/, '').downcase)
+        .to eql(NAVBAR_WITH_BRAND_AND_LINK.gsub(/\s/, '').downcase)
     end
 
     it "should add the buttons etc for a responsive layout with no block passed" do
-      nav_bar(:responsive => true).gsub(/\s/, '').downcase.should eql(RESPONSIVE_NAVBAR.gsub(/\s/, '').downcase)
+      expect(nav_bar(:responsive => true).gsub(/\s/, '').downcase).to eql(RESPONSIVE_NAVBAR.gsub(/\s/, '').downcase)
     end
 
     it "should add the buttons etc for a responsive layout with block passed" do
-      nav_bar(:responsive => true) do
+      ele = nav_bar(:responsive => true) do
         "<p>Passing a block</p>".html_safe
-      end.gsub(/\s/, '').downcase.should eql(RESPONSIVE_NAVBAR_WITH_BLOCK.gsub(/\s/, '').downcase)
+      end
+      expect(ele.gsub(/\s/, '').downcase).to eql(RESPONSIVE_NAVBAR_WITH_BLOCK.gsub(/\s/, '').downcase)
     end
 
     it "should render contained items" do
-      nav_bar do
+      ele = nav_bar do
         menu_group do
           menu_item("Home", "/") + menu_item("Products", "/products")
         end
-      end.gsub(/\s/, '').downcase.should eql(PLAIN_NAVBAR_WITH_ITEM.gsub(/\s/, '').downcase)
+      end
+      expect(ele.gsub(/\s/, '').downcase).to eql(PLAIN_NAVBAR_WITH_ITEM.gsub(/\s/, '').downcase)
     end
 
     it "should still render the brand name even with other options turned on" do
-      nav_bar(:brand => "Something") do
+      ele = nav_bar(:brand => "Something") do
         menu_group do
           menu_item "Home", "/"
         end
-      end.gsub(/\s/, '').downcase.should eql(BRANDED_NAVBAR_WITH_ITEM.gsub(/\s/, '').downcase)
+      end
+      expect(ele.gsub(/\s/, '').downcase).to eql(BRANDED_NAVBAR_WITH_ITEM.gsub(/\s/, '').downcase)
     end
   end
 
   describe "menu_group" do
     it "should return a ul with the class 'nav'" do
-      menu_group do
+      element = menu_group do
         menu_item("Home", "/") + menu_item("Products", "/products")
-      end.should eql '<ul class="nav "><li><a href="/">Home</a></li><li><a href="/products">Products</a></li></ul>'
+      end
+
+      expect(element).to have_tag(:ul, with: {class: "nav navbar-nav"}) {
+        with_tag(:li) {
+          with_tag(:a, text: "Home", with: {href: "/"})
+        }
+        with_tag(:li) {
+          with_tag(:a, text: "Products", with: {href: "/products"})
+        }
+      }
     end
 
-    it "should return a ul with class .pull-left when passed the {:pull => :left} option" do
-      menu_group(:pull => :left) do
+    it "should return a ul with class .navbar-left when passed the {pull: :left} option" do
+      element = menu_group(pull: :left) do
         menu_item("Home", "/")
-      end.should eql('<ul class="nav pull-left"><li><a href="/">Home</a></li></ul>')
+      end
+
+      expect(element).to have_tag(:ul, with: {class: "nav navbar-nav navbar-left"}) {
+        with_tag(:li) {
+          with_tag(:a, text: "Home", with: {href: "/"})
+        }
+      }
     end
   end
 
   describe "menu_item" do
     it "should return a link within an li tag" do
-      self.stub!("current_page?").and_return(false)
-      menu_item("Home", "/").should eql('<li><a href="/">Home</a></li>')
+      allow(self).to receive(:current_page?) { false }
+
+      element = menu_item("Home", "/")
+      expect(element).to have_tag(:li) {
+        with_tag(:a, text: "Home", with: { href: "/" })
+      }
     end
+
     it "should return the link with class 'active' if on current page" do
-      self.stub!("uri_state").and_return(:active)
-      menu_item("Home", "/").should eql('<li class="active"><a href="/">Home</a></li>')
+      allow(self).to receive(:uri_state) { :active }
+
+      element = menu_item("Home", "/")
+      expect(element).to have_tag(:li, with: {class: "active"}) {
+        with_tag(:a, text: "Home", with: { href: "/" })
+      }
     end
+
     it "should pass any other options through to the link_to method" do
-      self.stub!("uri_state").and_return(:active)
-      menu_item("Log out", "/users/sign_out", :class => "home_link", :method => :delete).should eql('<li class="active"><a href="/users/sign_out" class="home_link" data-method="delete" rel="nofollow">Log out</a></li>')
+      allow(self).to receive_message_chain("uri_state").and_return(:active)
+
+      element = menu_item("Log out", "/users/sign_out", class: "home_link", method: :delete)
+      expect(element).to have_tag(:li, with: {class: "active"}) {
+        with_tag(:a, text: "Log out", with: {
+          href: "/users/sign_out",
+          class: "home_link",
+          rel: "nofollow",
+          "data-method" => "delete"
+        })
+      }
     end
+
     it "should pass a block but no name if a block is present" do
-      self.stub!("current_page?").and_return(false)
-      menu_item("/"){content_tag("i", "", :class => "icon-home") + " Home"}.should eql('<li><a href="/"><i class="icon-home"></i> Home</a></li>')
+      allow(self).to receive(:current_page?) { false }
+
+      element = menu_item("/"){ content_tag("i", "", :class => "icon-home") + " Home" }
+      expect(element).to have_tag(:li) {
+        with_tag(:i, with: { class: "icon-home"})
+        with_tag(:a, text: " Home", with: { href: "/"})
+      }
     end
+
     it "should work with just a block" do
-      self.stub!("current_page?").and_return(false)
-      menu_item{ content_tag("i", "", :class => "icon-home") + " Home" }.should eql('<li><a href="#"><i class="icon-home"></i> Home</a></li>')
+      allow(self).to receive(:current_page?) { false }
+
+      element = menu_item{ content_tag("i", "", :class => "icon-home") + " Home" }
+      expect(element).to have_tag(:li) {
+        with_tag(:i, with: { class: "icon-home"})
+        with_tag(:a, text: " Home", with: { href: "#"})
+      }
     end
+
     it "should return the link with class 'active' if on current page with a block" do
-      self.stub!("uri_state").and_return(:active)
-      menu_item("/"){ content_tag("i", "", :class => "icon-home") + " Home" }.should eql('<li class="active"><a href="/"><i class="icon-home"></i> Home</a></li>')
+      allow(self).to receive(:uri_state) { :active }
+
+      element = menu_item("/"){ content_tag("i", "", :class => "icon-home") + " Home" }
+      expect(element).to have_tag(:li, with: {class: "active"}) {
+        with_tag(:i, with: { class: "icon-home"})
+        with_tag(:a, text: " Home", with: { href: "/"})
+      }
     end
   end
 
   describe "drop_down" do
     it "should do render the proper drop down code" do
-      drop_down "Products" do
+      ele = drop_down "Products" do
         menu_item "Latest", "/"
-      end.gsub(/\s/, '').downcase.should eql(DROPDOWN_MENU.gsub(/\s/, '').downcase)
+      end
+      expect(ele).to have_tag(:li, with: {class: 'dropdown'})
+      expect(ele).to have_tag(:a, with: {class: 'dropdown-toggle'})
     end
   end
 
   describe "drop_down_with_submenu" do
     it "should do render the proper drop down code" do
-      drop_down_with_submenu "Products" do
-        drop_down_submenu "Latest" do
-          menu_item "Option1", "/"
+      ele = drop_down_with_submenu "Products" do
+          drop_down_submenu "Latest" do
+            menu_item "Option1", "/"
+          end
         end
-      end.gsub(/\s/, '').downcase.should eql(DROPDOWN_MENU_WITH_SUBMENU.gsub(/\s/, '').downcase)
+      expect(ele).to have_tag(:li, with: {class: 'dropdown'})
+      expect(ele).to have_tag(:a, with: {class: 'dropdown-toggle'})
+      expect(ele).to have_tag(:ul, with: {class: 'dropdown-menu'})
     end
   end
 
   describe "menu_divider" do
     it "should render <li class='divider-vertical'></li>" do
-      menu_divider.should eql '<li class="divider-vertical"></li>'
+      expect(menu_divider).to match '<li class="divider-vertical"></li>'
     end
   end
 
   describe "menu_text" do
     it "should render text within p tags with class 'navbar-text" do
-      menu_text("Strapline!").should eql("<p class=\"navbar-text\">Strapline!</p>")
+      expect(menu_text("Strapline!")).to match("<p class=\"navbar-text\">Strapline!</p>")
     end
 
     it "should be able to be pulled right or left" do
-      menu_text("I am being pulled right", :pull => :right).should eql("<p class=\"pull-right navbar-text\">I am being pulled right</p>")
+      expect(menu_text("I am being pulled right", :pull => :right)).to match("<p class=\"pull-right navbar-text\">I am being pulled right</p>")
     end
 
     it "should be able to cope with arbitrary options being passed to the p tag" do
-      menu_text("I am classy!", :class => "classy", :id => "classy_text").should eql("<p class=\"classy navbar-text\" id=\"classy_text\">I am classy!</p>")
+      expect(menu_text("I am classy!", :class => "classy", :id => "classy_text")).to match("<p class=\"classy navbar-text\" id=\"classy_text\">I am classy!</p>")
     end
 
     it "should be able to cope with a block too" do
-      menu_text do
-        "I have been rendered programmatically!"
-      end.should eql("<p class=\"navbar-text\">I have been rendered programmatically!</p>")
+      ele = menu_text("I have been rendered programmatically!")
+      expect(ele).to have_tag(:p, with: {class: "navbar-text"})
+      expect(ele).to match "I have been rendered programmatically!"
     end
   end
 
   describe "rendering forms ok" do
     it "should not escape anything unexpectedly" do
-      nav_bar do
-        form_tag "/", :method => 'get' do |f|
-          f.text_field :search, "stub"
+      expect(
+        nav_bar do
+          form_tag "/", :method => 'get' do |f|
+            f.text_field :search, "stub"
+          end
         end
-      end.gsub(/\s/, '').downcase.should eql(PLAIN_NAVBAR_WITH_FORM.gsub(/\s/, '').downcase)
+        ).to have_tag(:form)
+    end
+  end
+
+  describe "default navbar" do
+    it "renders a navbar" do
+      expect(nav_bar { 'foo' }).to have_tag(:nav, with: { class: 'navbar navbar-default', role: 'navigation' }, text: /foo/)
     end
   end
 
@@ -174,167 +245,132 @@ end
 # HTML output
 
 BASIC_NAVBAR = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 FIXED_TOP_NAVBAR = <<-HTML
-<div class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 STATIC_TOP_NAVBAR = <<-HTML
-<div class="navbar navbar-static-top">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default navbar-static-top" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 FIXED_BOTTOM_NAVBAR = <<-HTML
-<div class="navbar navbar-fixed-bottom">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 INVERSE_NAVBAR = <<-HTML
-<div class="navbar navbar-inverse">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
-  </div>
-</div>
-HTML
-
-BASIC_NAVBAR_FLUID= <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container-fluid">
-    </div>
+<nav class="navbar navbar-default navbar-inverse" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 NAVBAR_WITH_BRAND = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-			<a href="/" class="brand">
-			  Ninety Ten
-			</a>
-    </div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <a class="navbar-brand" href="/">
+      Ninety Ten
+    </a>
   </div>
-</div>
+</nav>
 HTML
 
 NAVBAR_WITH_BRAND_AND_LINK = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-			<a href="http://www.ninetyten.com" class="brand">
-			  Ninety Ten
-			</a>
-    </div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <a class="navbar-brand" href="http://www.ninetyten.com">
+      Ninety Ten
+    </a>
   </div>
-</div>
+</nav>
 HTML
 
 RESPONSIVE_NAVBAR = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle Navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-      </a>
-      <div class="nav-collapse">
-      </div>
+      </button>
+    </div>
+    <div class="navbar-collapse collapse">
     </div>
   </div>
-</div>
+</nav>
 HTML
 
 RESPONSIVE_NAVBAR_WITH_BLOCK = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle Navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-      </a>
-      <div class="nav-collapse">
-				<p>Passing a block</p>
-      </div>
+      </button>
+    </div>
+    <div class="navbar-collapse collapse">
+              <p>Passing a block</p>
     </div>
   </div>
-</div>
+</nav>
 HTML
 
 PLAIN_NAVBAR_WITH_ITEM = <<-HTML
-<div class="navbar">
-	<div class="navbar-inner">
-		<div class="container">
-			<ul class="nav">
-				<li>
-					<a href="/">Home</a>
-				</li>
-				<li>
-					<a href="/products">Products</a>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <ul class="nav navbar-nav">
+      <li>
+        <a href="/">Home</a>
+      </li>
+      <li>
+        <a href="/products">Products</a>
+      </li>
+    </ul>
+  </div>
+</nav>
 HTML
 
 BRANDED_NAVBAR_WITH_ITEM = <<-HTML
-<div class="navbar">
-	<div class="navbar-inner">
-		<div class="container">
-			<a href="/" class="brand">
-			  Something
-			</a>
-			<ul class="nav">
-				<li>
-					<a href="/">Home</a>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <a class="navbar-brand" href="/">
+      Something
+    </a>
+    <ul class="nav navbar-nav">
+      <li>
+        <a href="/">Home</a>
+      </li>
+    </ul>
+  </div>
+</nav>
 HTML
 
 DROPDOWN_MENU = <<-HTML
-<li class="dropdown">
-  <a href="#"
-        class="dropdown-toggle"
-        data-toggle="dropdown">
-        Products
-        <b class="caret"></b>
-  </a>
-  <ul class="dropdown-menu">
-    <li><a href="/">Latest</a></li>
-  </ul>
-</li>
+<li class="dropdown"> <a class="dropdown-toggle"data-toggle="dropdown"href="#"> Products <b class="caret"></b> </a> <ul class="dropdown-menu"> <li><a href="/">Latest</a></li> </ul> </li>
 HTML
 
 DROPDOWN_MENU_WITH_SUBMENU = <<-HTML
 <li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Products <b class="caret"></b></a>
+  <a class="dropdown-toggle" data-toggle="dropdown" href="#">Products <b class="caret"></b></a>
   <ul class="dropdown-menu">
     <li class="dropdown-submenu">
       <a href="">Latest</a>
@@ -347,16 +383,14 @@ DROPDOWN_MENU_WITH_SUBMENU = <<-HTML
 HTML
 
 PLAIN_NAVBAR_WITH_FORM = <<-HTML
-<div class="navbar">
-	<div class="navbar-inner">
-		<div class="container">
-			<form accept-charset="utf-8" action="/" method="get">
-				<div style="margin:0;padding:0;display:inline">
-					<input name="utf8" type="hidden" value="&#x2713;"/>
-				</div>
-				<input id="search_stub" name="search[stub]" size="30" type="text"/>
-			</form>
-		</div>
-	</div>
-</div>
+<nav class=\"navbar navbar-default\"role=\"navigation\">
+  <div class=\"container\">
+    <form accept-charset=\"utf-8\" action=\"/\" method=\"get\">
+      <div style=\"display:none\">
+        <input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\"/>
+      </div>
+      <input id=\"search_stub\" name=\"search[stub]\" type=\"text\"/>
+    </form>
+  </div>
+</nav>
 HTML