simple_navigation_bootstrap 1.0.1 → 1.1.0

data/.travis.yml

@@ -1,6 +1,11 @@
+dist: trusty
 language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
+  - jruby-9.2.0.0
+after_success:
+  - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGELOG
 
+### 1.1.0 - 2018-08-27
+
+* Add magic comment # frozen_string_literal: true
+* Coding style
+* Fix deprecation warning: Extra .css in SCSS file is unnecessary (thanks gltarsa)
+
+
 ### 1.0.1 - 2016-06-24
 
 * Use \<i\> tag for icons

data/Gemfile

@@ -1,14 +1,9 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in simple_navigation_bootstrap.gemspec
 gemspec
 
-# Get master branch of simple-navigation to fix 'undefined class ::Rails::Railtie' error
-# See: https://github.com/codeplant/simple-navigation/commit/fb2c41511ade34e1ed6857a89ab2c7f1eead3ecb
-gem 'simple-navigation', git: 'https://github.com/codeplant/simple-navigation.git'
-
-# README edition
-gem 'gh-preview'
-
 # CodeClimate Test Coverage
 gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

@@ -2,12 +2,13 @@
 
 [![GitHub license](https://img.shields.io/github/license/jbox-web/simple_navigation_bootstrap.svg)](https://github.com/jbox-web/simple_navigation_bootstrap/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/jbox-web/simple_navigation_bootstrap.svg)](https://github.com/jbox-web/simple_navigation_bootstrap/releases/latest)
+[![Gem](https://img.shields.io/gem/v/simple_navigation_bootstrap.svg)](https://rubygems.org/gems/simple_navigation_bootstrap/versions/1.0.1)
+[![Gem](https://img.shields.io/gem/dtv/simple_navigation_bootstrap.svg)](https://rubygems.org/gems/simple_navigation_bootstrap/versions/1.0.1)
 [![Build Status](https://travis-ci.org/jbox-web/simple_navigation_bootstrap.svg?branch=master)](https://travis-ci.org/jbox-web/simple_navigation_bootstrap)
 [![Code Climate](https://codeclimate.com/github/jbox-web/simple_navigation_bootstrap/badges/gpa.svg)](https://codeclimate.com/github/jbox-web/simple_navigation_bootstrap)
 [![Test Coverage](https://codeclimate.com/github/jbox-web/simple_navigation_bootstrap/badges/coverage.svg)](https://codeclimate.com/github/jbox-web/simple_navigation_bootstrap/coverage)
-[![Dependency Status](https://gemnasium.com/badges/github.com/jbox-web/simple_navigation_bootstrap.svg)](https://gemnasium.com/github.com/jbox-web/simple_navigation_bootstrap)
 
-This gem adds Bootstrap renderers for Simple Navigation. For now, it is include renderers for:
+This gem adds Bootstrap renderers for [Simple Navigation](https://github.com/codeplant/simple-navigation). For now, it is include renderers for:
 
 * [Bootstrap 2 navigation](http://getbootstrap.com/2.3.2/components.html#navbar)
 * [Bootstrap 3 navigation](http://getbootstrap.com/components/#navbar)
@@ -15,9 +16,11 @@ This gem adds Bootstrap renderers for Simple Navigation. For now, it is include
 With these renderers you will be able create **any Bootstrap navigation elements**, such as: **submenu**, **navbar-text**, **divider**, **header**.
 As well as add **icons** to menu elements, such as: Glyphicons, Font Awesome icons, even custom icons. Also you have **split** option for main menu containing submenu.
 
-*This gem is fork of [ShPakvel/simple\_navigation\_renderers](https://github.com/ShPakvel/simple_navigation_renderers).*
+*This gem is a fork of [ShPakvel/simple\_navigation\_renderers](https://github.com/ShPakvel/simple_navigation_renderers).*
 *After a year of waiting for [PR merge](https://github.com/ShPakvel/simple_navigation_renderers/pull/14) without any news from the author, I decided to fork it.*
 
+**This gem is compatible with SimpleNavigation 4.x.**
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -75,7 +78,7 @@ Lets look at the example:
 
 ```ruby
 SimpleNavigation::Configuration.run do |navigation|
-  navigation.renderer = SimpleNavigationRenderers::Bootstrap3
+  navigation.renderer = SimpleNavigationBootstrap::Bootstrap3
 
   navigation.items do |primary|
     primary.item :news, { icon: 'fa fa-fw fa-bullhorn', text: 'News' }, news_index_path
@@ -103,13 +106,13 @@ end
 
 Specific options used in the example:
 
-    Option     | Description
----------------|--------------
-`:split`       | Use it to split first level item link with caret. If you add `split: true` option to item, then caret itself will toggle first level submenu and link will have standard behaviour, instead of toggle submenu. You can use `:split` only with first level items, for the rest it will not do anything.
-`:navbar_text` | Use it as `navbar_text: true` to add Bootstrap `navbar-text`.
-`:divider`     | Use it to add Bootstrap menu divider. if you add `divider: true` option to first level item, then it will create li-tag with `divider-vertical` Bootstrap 2 class. (You can add `divider-vertical` class to Bootstrap 3 - see below). For the second level item and deeper it will create `li` tag with class `divider` (which exists in both, Bootstrap 2 and 3).
-`:header`      | Use it as `header: true` to add Bootstrap menu header. You can use `:header` only with submenus, for the first level items it will not do anything.
-`:name hash`   | Use it in place of `:name` if you want. Hash can have three keys: `:text`, `:icon` and `:title`, which is only recognized. You can use it together or separatly, but at least one of `:text` and `:icon` parameters should be provided.
+|    Option     | Description
+|---------------|--------------
+|`:split`       | Use it to split first level item link with caret. If you add `split: true` option to item, then caret itself will toggle first level submenu and link will have standard behaviour, instead of toggle submenu. You can use `:split` only with first level items, for the rest it will not do anything.
+|`:navbar_text` | Use it as `navbar_text: true` to add Bootstrap `navbar-text`.
+|`:divider`     | Use it to add Bootstrap menu divider. if you add `divider: true` option to first level item, then it will create li-tag with `divider-vertical` Bootstrap 2 class. (You can add `divider-vertical` class to Bootstrap 3 - see below). For the second level item and deeper it will create `li` tag with class `divider` (which exists in both, Bootstrap 2 and 3).
+|`:header`      | Use it as `header: true` to add Bootstrap menu header. You can use `:header` only with submenus, for the first level items it will not do anything.
+|`:name hash`   | Use it in place of `:name` if you want. Hash can have three keys: `:text`, `:icon` and `:title`, which is only recognized. You can use it together or separately, but at least one of `:text` and `:icon` parameters should be provided.
 
 Example for `:name hash`:
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/simple_navigation_bootstrap.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'simple-navigation'
-require 'simple_navigation_bootstrap/errors'
-require 'simple_navigation_bootstrap/rendered_item'
-require 'simple_navigation_bootstrap/bootstrap_base'
-require 'simple_navigation_bootstrap/bootstrap2'
-require 'simple_navigation_bootstrap/bootstrap3'
-require 'simple_navigation_bootstrap/engine' if defined? Rails::Engine
 
 module SimpleNavigationBootstrap
+  require 'simple_navigation_bootstrap/errors'
+  require 'simple_navigation_bootstrap/rendered_item'
+  require 'simple_navigation_bootstrap/bootstrap_base'
+  require 'simple_navigation_bootstrap/bootstrap2'
+  require 'simple_navigation_bootstrap/bootstrap3'
+  require 'simple_navigation_bootstrap/engine' if defined? Rails::Engine
 end
 
 SimpleNavigation.register_renderer(bootstrap2: SimpleNavigationBootstrap::Bootstrap2)

data/lib/simple_navigation_bootstrap/bootstrap2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   class Bootstrap2 < SimpleNavigation::Renderer::Base
 

data/lib/simple_navigation_bootstrap/bootstrap3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   class Bootstrap3 < SimpleNavigation::Renderer::Base
 

data/lib/simple_navigation_bootstrap/bootstrap_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   module BootstrapBase
 
@@ -32,7 +34,7 @@ module SimpleNavigationBootstrap
 
 
       def container_class(level)
-        remove_navigation_class = options.delete(:remove_navigation_class){ false }
+        remove_navigation_class = options.delete(:remove_navigation_class) { false }
         if level == 1
           remove_navigation_class ? '' : ['nav', navigation_class].compact
         else

data/lib/simple_navigation_bootstrap/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   class Engine < ::Rails::Engine
   end

data/lib/simple_navigation_bootstrap/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   # Exception raised when you set Hash without both 'text' and 'icon' parameters as Item 'name' parameter
   class InvalidHash < StandardError

data/lib/simple_navigation_bootstrap/rendered_item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   class RenderedItem
     extend Forwardable

data/lib/simple_navigation_bootstrap/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleNavigationBootstrap
   # Returns the version of the currently loaded Rails as a <tt>Gem::Version</tt>
   def self.gem_version
@@ -6,8 +8,8 @@ module SimpleNavigationBootstrap
 
   module VERSION
     MAJOR = 1
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/simple_navigation_bootstrap.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'simple_navigation_bootstrap/version'
 
 Gem::Specification.new do |s|
@@ -9,21 +10,20 @@ Gem::Specification.new do |s|
   s.authors     = ['Pavel Shpak', 'Nicolas Rodriguez']
   s.email       = ['shpakvel@gmail.com', 'nrodriguez@jbox-web.com']
   s.homepage    = 'https://github.com/jbox-web/simple_navigation_bootstrap'
-  s.summary     = %q{A Ruby gem that adds Bootstrap renderers for SimpleNavigation}
-  s.description = %q{This gem adds Bootstrap2 and Bootstrap3 renderers for SimpleNavigation}
+  s.summary     = 'A Ruby gem that adds Bootstrap renderers for SimpleNavigation'
+  s.description = 'This gem adds Bootstrap2 and Bootstrap3 renderers for SimpleNavigation'
   s.license     = 'MIT'
 
   s.add_runtime_dependency 'simple-navigation', '~> 4.0'
 
   s.add_development_dependency 'actionpack'
   s.add_development_dependency 'actionview'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'bundler', '~> 1.3'
-  s.add_development_dependency 'rake'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

data/spec/lib/simple_navigation_bootstrap/bootstrap2_spec.rb

@@ -2,52 +2,51 @@ require 'spec_helper'
 
 describe SimpleNavigationBootstrap::Bootstrap2 do
 
-  describe '#render' do
+  let(:bootstrap_menu) { build_menu(version: 2) }
 
+  describe '#render' do
     it "wraps main menu in ul-tag with 'nav' class" do
-      check_selector build_menu(version: 2), 'ul.nav.navbar-nav', 0
-      check_selector build_menu(version: 2), 'ul.nav'
+      check_selector bootstrap_menu, 'ul.nav.navbar-nav', 0
+      check_selector bootstrap_menu, 'ul.nav'
     end
 
-
     context "when ':header' option provided" do
       context "for the first level item" do
         it "does not set up 'dropdown-header' or 'nav-header' class on li-tag" do
-          check_selector build_menu(version: 2), 'ul.nav > li.to_check_header.nav-header', 0
+          check_selector bootstrap_menu, 'ul.nav > li.to_check_header.nav-header', 0
         end
 
         it "creates link-tag for the item (standard item)" do
-          check_selector build_menu(version: 2), 'ul.nav > li.to_check_header > a'
+          check_selector bootstrap_menu, 'ul.nav > li.to_check_header > a'
         end
       end
 
       context "for the second level item and deeper" do
         it "sets up 'nav-header' class on li-tag" do
-          check_selector build_menu(version: 2), 'ul.dropdown-menu > li.to_check_header2.nav-header'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.to_check_header2.nav-header'
         end
 
         it "does not create link-tag for the item (standard item), but puts only item 'name'" do
-          check_selector build_menu(version: 2), 'ul.dropdown-menu > li.to_check_header2.nav-header > a', 0
-          check_title build_menu(version: 2), 'ul.dropdown-menu > li.to_check_header2.nav-header', 'Misc. Pages'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.to_check_header2.nav-header > a', 0
+          check_title    bootstrap_menu, 'ul.dropdown-menu > li.to_check_header2.nav-header', 'Misc. Pages'
         end
       end
     end
 
-
     context "when ':navbar_text' option provided" do
       it "creates p-tag with class 'navbar-text' and item 'name' as a content instead of link-tag for the item (standard item)" do
-        check_selector build_menu(version: 2), 'ul > li.to_check_navbar_text > a', 0
-        check_title build_menu(version: 2), 'ul > li.to_check_navbar_text > p.navbar-text', 'Signed in as Pavel Shpak'
+        check_selector bootstrap_menu, 'ul > li.to_check_navbar_text > a', 0
+        check_title    bootstrap_menu, 'ul > li.to_check_navbar_text > p.navbar-text', 'Signed in as Pavel Shpak'
       end
     end
 
-
     context "when container is empty" do
+      let(:bootstrap_menu) { build_menu(version: 2, menu_name: :empty_menu, menu_opts: { skip_if_empty: true }) }
+
       it 'return empty list' do
-        check_selector build_menu(version: 2, menu_name: :empty_menu, menu_opts: { skip_if_empty: true }), 'ul > li', 0
+        check_selector bootstrap_menu, 'ul > li', 0
       end
     end
-
   end
 
 end

data/spec/lib/simple_navigation_bootstrap/bootstrap3_spec.rb

@@ -2,183 +2,176 @@ require 'spec_helper'
 
 describe SimpleNavigationBootstrap::Bootstrap3 do
 
-  describe '#render' do
+  let(:bootstrap_menu) { build_menu(version: 3) }
 
+  describe '#render' do
     it "wraps main menu in ul-tag with 'nav navbar-nav' classes" do
-      check_selector build_menu(version: 3), 'ul.nav.navbar-nav'
+      check_selector bootstrap_menu, 'ul.nav.navbar-nav'
     end
 
-
     it "sets up 'active' class on selected items (on li-tags)" do
-      check_selector build_menu(version: 3), 'ul.nav.navbar-nav > li.active > a[href="news_index_path"]'
+      check_selector bootstrap_menu, 'ul.nav.navbar-nav > li.active > a[href="news_index_path"]'
     end
 
-
     it "wraps submenu in ul-tag 'dropdown-menu' class" do
-      check_selector build_menu(version: 3), 'ul > li > ul.dropdown-menu > li > ul.dropdown-menu'
+      check_selector bootstrap_menu, 'ul > li > ul.dropdown-menu > li > ul.dropdown-menu'
     end
 
-
     context "for the first level submenu (the second level menu)" do
       it "sets up 'dropdown' class on li-tag which contains that submenu" do
-        check_selector build_menu(version: 3), 'ul > li.dropdown'
+        check_selector bootstrap_menu, 'ul > li.dropdown'
       end
 
       it "sets up 'dropdown-toggle' class on link-tag which is used for toggle that submenu" do
-        check_selector build_menu(version: 3), 'ul > li.dropdown > a.dropdown-toggle'
+        check_selector bootstrap_menu, 'ul > li.dropdown > a.dropdown-toggle'
       end
 
       it "sets up 'data-toggle' attribute to 'dropdown' on link-tag which is used for toggle that submenu" do
-        check_selector build_menu(version: 3), 'ul > li.dropdown > a[data-toggle=dropdown]'
+        check_selector bootstrap_menu, 'ul > li.dropdown > a[data-toggle=dropdown]'
       end
 
       it "sets up 'data-target' attribute to '#' on link-tag which is used for toggle that submenu" do
-        check_selector build_menu(version: 3), 'ul > li.dropdown > a[data-target="#"]'
+        check_selector bootstrap_menu, 'ul > li.dropdown > a[data-target="#"]'
       end
 
       it "sets up 'href' attribute to '#' on link-tag which is used for toggle that submenu" do
-        check_selector build_menu(version: 3), 'ul > li.dropdown > a[href="#"]'
+        check_selector bootstrap_menu, 'ul > li.dropdown > a[href="#"]'
       end
 
       it "puts b-tag with 'caret' class in li-tag which contains that submenu" do
-        check_selector build_menu(version: 3), 'ul > li.dropdown > a[href="#"] > b.caret'
+        check_selector bootstrap_menu, 'ul > li.dropdown > a[href="#"] > b.caret'
       end
     end
 
-
     context "for nested submenu (the third level menu and deeper)" do
       it "sets up 'dropdown-submenu' class on li-tag which contains that submenu" do
-        check_selector build_menu(version: 3), 'ul > li > ul.dropdown-menu > li.dropdown-submenu'
+        check_selector bootstrap_menu, 'ul > li > ul.dropdown-menu > li.dropdown-submenu'
       end
     end
 
-
     context "when ':split' option provided" do
       context "for the first level item which contains submenu" do
         it "splits item on two li-tags (left and right) and right li-tag will contain the first level submenu (second level menu)" do
-          check_selector build_menu(version: 3), 'ul > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu'
+          check_selector bootstrap_menu, 'ul > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu'
         end
 
         it "sets up 'pull-right' class on ul-tag which is the submenu" do
-          check_selector build_menu(version: 3), 'ul > li > ul.dropdown-menu.pull-right'
+          check_selector bootstrap_menu, 'ul > li > ul.dropdown-menu.pull-right'
         end
       end
 
       context "for the second level item and deeper which contains submenu" do
         it "does not splits item on two li-tags" do
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu', 0
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li.dropdown-submenu > ul.dropdown-menu'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu', 0
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.dropdown-submenu > ul.dropdown-menu'
         end
 
         it "does not sets up 'pull-right' class on ul-tag which is the submenu" do
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li > ul.dropdown-menu.pull-right', 0
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li > ul.dropdown-menu.pull-right', 0
         end
       end
 
       context "for item which does not contain submenu" do
         it "does not splits item on two li-tags" do
-          check_selector build_menu(version: 3), 'ul > li.to_check_split.dropdown-split-left + li.dropdown.dropdown-split-right', 0
-          check_selector build_menu(version: 3), 'ul > li.to_check_split'
+          check_selector bootstrap_menu, 'ul > li.to_check_split.dropdown-split-left + li.dropdown.dropdown-split-right', 0
+          check_selector bootstrap_menu, 'ul > li.to_check_split'
         end
       end
     end
 
-
     context "when ':split' option is not provided" do
+      let(:bootstrap_menu) { build_menu(version: 3, menu_name: :unsplited_menu) }
+
       context "for the first level item which contains submenu" do
         it "does not splits item on two li-tags (left and right) and right li-tag will contain the first level submenu (second level menu)" do
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu', 0
+          check_selector bootstrap_menu, 'ul > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu', 0
         end
 
         it "does not sets up 'pull-right' class on ul-tag which is the submenu" do
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul > li > ul.dropdown-menu.pull-right', 0
+          check_selector bootstrap_menu, 'ul > li > ul.dropdown-menu.pull-right', 0
         end
       end
 
       context "for the second level item and deeper which contains submenu" do
         it "does not splits item on two li-tags" do
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul.dropdown-menu > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu', 0
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul.dropdown-menu > li.dropdown-submenu > ul.dropdown-menu'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.dropdown-split-left + li.dropdown.dropdown-split-right > ul.dropdown-menu', 0
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.dropdown-submenu > ul.dropdown-menu'
         end
 
         it "does not sets up 'pull-right' class on ul-tag which is the submenu" do
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul.dropdown-menu > li > ul.dropdown-menu.pull-right', 0
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li > ul.dropdown-menu.pull-right', 0
         end
       end
 
       context "for item which does not contain submenu" do
         it "does not splits item on two li-tags" do
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul > li.to_check_split.dropdown-split-left + li.dropdown.dropdown-split-right', 0
-          check_selector build_menu(version: 3, menu_name: :unsplited_menu), 'ul > li.to_check_split'
+          check_selector bootstrap_menu, 'ul > li.to_check_split.dropdown-split-left + li.dropdown.dropdown-split-right', 0
+          check_selector bootstrap_menu, 'ul > li.to_check_split'
         end
       end
     end
 
-
     context "when ':navbar_text' option provided" do
       it "creates p-tag with class 'navbar-text' and item 'name' as a content instead of link-tag for the item (standard item)" do
-        check_selector build_menu(version: 3), 'ul > li.to_check_navbar_text > a', 0
-        check_title build_menu(version: 3), 'ul > li.to_check_navbar_text > p.navbar-text', 'Signed in as Pavel Shpak'
+        check_selector bootstrap_menu, 'ul > li.to_check_navbar_text > a', 0
+        check_title    bootstrap_menu, 'ul > li.to_check_navbar_text > p.navbar-text', 'Signed in as Pavel Shpak'
       end
     end
 
-
     context "when ':divider' option provided" do
       it "does not create link-tag for the item (standard item)" do
-        check_selector build_menu(version: 3), 'ul > li.divider-vertical + li > a[href="divider_before_info_index_path"]', 0
-        check_selector build_menu(version: 3), 'ul.dropdown-menu > li.divider + li > a[href="divider_before_misc_info_pages"]', 0
-        check_selector build_menu(version: 3), 'ul.dropdown-menu > li.divider + li > a[href="divider_before_contact_info_page"]', 0
+        check_selector bootstrap_menu, 'ul > li.divider-vertical + li > a[href="divider_before_info_index_path"]', 0
+        check_selector bootstrap_menu, 'ul.dropdown-menu > li.divider + li > a[href="divider_before_misc_info_pages"]', 0
+        check_selector bootstrap_menu, 'ul.dropdown-menu > li.divider + li > a[href="divider_before_contact_info_page"]', 0
       end
 
       context "for the first level item" do
         it "adds li-tag with class 'divider-vertical'" do
-          check_selector build_menu(version: 3), 'ul > li.divider-vertical + li > a[href="info_index_path"]'
+          check_selector bootstrap_menu, 'ul > li.divider-vertical + li > a[href="info_index_path"]'
         end
       end
 
       context "for the second level item and deeper" do
         it "adds li-tag with class 'divider'" do
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li.divider + li > a[href="misc_info_pages"]'
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li.divider + li > a[href="contact_info_page"]'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.divider + li > a[href="misc_info_pages"]'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.divider + li > a[href="contact_info_page"]'
         end
       end
     end
 
-
     context "when ':header' option provided" do
       context "for the first level item" do
         it "does not set up 'dropdown-header' or 'nav-header' class on li-tag" do
-          check_selector build_menu(version: 3), 'ul.nav.navbar-nav > li.to_check_header.dropdown-header', 0
+          check_selector bootstrap_menu, 'ul.nav.navbar-nav > li.to_check_header.dropdown-header', 0
         end
 
         it "creates link-tag for the item (standard item)" do
-          check_selector build_menu(version: 3), 'ul.nav.navbar-nav > li.to_check_header > a'
+          check_selector bootstrap_menu, 'ul.nav.navbar-nav > li.to_check_header > a'
         end
       end
 
       context "for the second level item and deeper" do
         it "sets up 'dropdown-header' class on li-tag" do
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li.to_check_header2.dropdown-header'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.to_check_header2.dropdown-header'
         end
 
         it "does not create link-tag for the item (standard item), but puts only item 'name'" do
-          check_selector build_menu(version: 3), 'ul.dropdown-menu > li.to_check_header2.dropdown-header > a', 0
-          check_title build_menu(version: 3), 'ul.dropdown-menu > li.to_check_header2.dropdown-header', 'Misc. Pages'
+          check_selector bootstrap_menu, 'ul.dropdown-menu > li.to_check_header2.dropdown-header > a', 0
+          check_title    bootstrap_menu, 'ul.dropdown-menu > li.to_check_header2.dropdown-header', 'Misc. Pages'
         end
       end
     end
 
-
     context "when 'hash' provided in place of 'name'" do
       context "with ':icon' parameter" do
         it "adds i-tag with classes from the parameter" do
-          check_selector build_menu(version: 3), 'ul > li > a > i.fa.fa-fw.fa-bullhorn'
+          check_selector bootstrap_menu, 'ul > li > a > i.fa.fa-fw.fa-bullhorn'
         end
       end
 
       context "with ':title' parameter" do
         it "sets up 'title' attribute on icon's i-tag to the parameter value" do
-          check_selector build_menu(version: 3), 'ul > li > a > i.fa.fa-fw.fa-book[title="Info"]'
+          check_selector bootstrap_menu, 'ul > li > a > i.fa.fa-fw.fa-book[title="Info"]'
         end
       end
 
@@ -197,13 +190,13 @@ describe SimpleNavigationBootstrap::Bootstrap3 do
       end
     end
 
-
     context "when container is empty" do
+      let(:bootstrap_menu) { build_menu(version: 3, menu_name: :empty_menu, menu_opts: { skip_if_empty: true }) }
+
       it 'return empty list' do
-        check_selector build_menu(version: 3, menu_name: :empty_menu, menu_opts: { skip_if_empty: true }), 'ul > li', 0
+        check_selector bootstrap_menu, 'ul > li', 0
       end
     end
-
   end
 
 end