all the non-models specs have been fixed

lib/locomotive/liquid/drops/content_entry.rb

@@ -44,7 +44,7 @@ module Locomotive
         end
 
         def _label
-          self._label
+          @_label ||= self._source._label
         end
 
       end

lib/locomotive/liquid/drops/page.rb

@@ -6,7 +6,7 @@ module Locomotive
         delegate :seo_title, :meta_keywords, :meta_description, :to => '_source'
 
         def title
-          self._source.templatized? ? @context['content_entry'].highlighted_field_value : self._source.title
+          self._source.templatized? ? @context['content_entry']._label : self._source.title
         end
 
         def slug

lib/locomotive/liquid/tags/nav.rb

@@ -46,7 +46,8 @@ module Locomotive
           output = children_output.join("\n")
 
           if @options[:no_wrapper] != 'true'
-            output = %{<ul id="#{@options[:id]}" class="#{@options[:class]}">\n#{output}</ul>}
+            list_class = !@options[:class].blank? ? %( class="#{@options[:class]}") : ''
+            output = %{<ul id="#{@options[:id]}"#{list_class}>\n#{output}</ul>}
           end
 
           output

lib/locomotive/middlewares/seo_trailing_slash.rb

@@ -9,7 +9,7 @@ module Locomotive
       def call(env)
         path = env['PATH_INFO']
 
-        if !path.starts_with?("/#{Locomotive.mounted_on}/") && (match = path.match(%r{(.+)/$}))
+        if !path.starts_with?("#{Locomotive.mounted_on}/") && (match = path.match(%r{(.+)/$}))
           response = Rack::Response.new
           response.redirect(match[1], 301) # moved permanently
           response.finish

spec/lib/locomotive/httparty/patches_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'Httparty patches' do
-
-  describe 'Crack patch' do
-
-    context '#parsing json' do
-
-      it 'fixes an issue about json input beginning by a variable declaration' do
-        lambda {
-          Crack::JSON.parse('var json = { "foo": 42 };')
-        }.should_not raise_error
-      end
-
-    end
-
-  end
-
-end

spec/lib/locomotive/liquid/drops/page_spec.rb

@@ -47,7 +47,7 @@ describe Locomotive::Liquid::Drops::Page do
     end
 
     it 'renders title of parent page' do
-      content = render_template '{{ sub_page.parent.title }}', {'sub_page' => @sub_page}
+      content = render_template '{{ sub_page.parent.title }}', { 'sub_page' => @sub_page }
       content.should == "Home page"
     end
 
@@ -56,10 +56,11 @@ describe Locomotive::Liquid::Drops::Page do
   context '#breadcrumbs' do
     before(:each) do
       @sub_page = FactoryGirl.build(:sub_page, :meta_keywords => 'Sub Libidinous, Angsty', :meta_description => "Sub Quite the combination.")
+      @sub_page.stubs(:ancestors_and_self).returns([FactoryGirl.build(:page), @sub_page])
     end
 
     it 'renders breadcrumbs of current page' do
-      content = render_template '{% for crumb in sub_page.breadcrumbs %}{{ crumb.title}},{% endfor %}', {'sub_page' => @sub_page}
+      content = render_template '{% for crumb in sub_page.breadcrumbs %}{{ crumb.title }},{% endfor %}', { 'sub_page' => @sub_page }
       content.should == 'Home page,Subpage,'
     end
   end
@@ -73,7 +74,7 @@ describe Locomotive::Liquid::Drops::Page do
     it 'renders the content instance highlighted field instead for a templatized page' do
       templatized = FactoryGirl.build(:page, :title => 'Lorem ipsum template', :templatized => true)
 
-      content_entry = Locomotive::Liquid::Drops::Content.new(mock('content_entry', :highlighted_field_value => 'Locomotive rocks !'))
+      content_entry = Locomotive::Liquid::Drops::ContentEntry.new(mock('content_entry', :_label => 'Locomotive rocks !'))
 
       render_template('{{ page.title }}', 'page' => templatized, 'content_entry' => content_entry).should == 'Locomotive rocks !'
     end

spec/lib/locomotive/liquid/tags/nav_spec.rb

@@ -96,10 +96,20 @@ describe Locomotive::Liquid::Tags::Nav do
       render_nav('site', {}, 'icon: after').should match /<li id="child-1-link" class="link first"><a href="\/child_1">Child #1<span><\/span><\/a><\/li>/
     end
 
-    it 'assign a different dom id' do
+    it 'assigns a different dom id' do
       render_nav('site', {}, 'id: "main-nav"').should match /<ul id="main-nav">/
     end
 
+    it 'assigns a class' do
+      render_nav('site', {}, 'class: "nav"').should match /<ul id="nav" class="nav">/
+    end
+
+    it 'assigns a class other than "on" for a selected item' do
+      (page = @home.children.last.children.first).stubs(:parent).returns(@home.children.last)
+      output = render_nav 'parent', { :page => page }, 'active_class: "active"'
+      output.should match /<li id="sub-child-1-link" class="link active first">/
+    end
+
     it 'excludes entries based on a regexp' do
       render_nav('page', {}, 'exclude: "child_1"').should == '<ul id="nav"><li id="child-2-link" class="link first last"><a href="/child_2">Child #2</a></li></ul>'
     end

spec/lib/locomotive/liquid/tags/seo_spec.rb

@@ -81,8 +81,8 @@ describe Locomotive::Liquid::Tags::SEO do
 
       let(:content_type) do
         FactoryGirl.build(:content_type, :site => site).tap do |ct|
-          ct.entries_custom_fields.build :label => 'anything', :type => 'String'
+          ct.entries_custom_fields.build :label => 'anything', :type => 'string'
-        end
+        end.tap { |_ct| _ct.valid? }
       end
 
       context "has seo title" do

spec/lib/locomotive/render_spec.rb

@@ -128,19 +128,18 @@ describe 'Locomotive rendering system' do
         @content_type = FactoryGirl.build(:content_type, :site => nil)
         @content_entry = @content_type.entries.build(:_visible => true)
         @page.templatized = true
-        @page.content_type = @content_type
+        @page.stubs(:fetch_target_entry).returns(@content_entry)
         @controller.request.fullpath = '/projects/edeneo.html'
         @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{projects/edeneo projects/content_type_template} }).returns([@page])
       end
 
       it 'sets the content_entry variable' do
-        @content_type.entries.stubs(:where).returns([@content_entry])
         @controller.send(:locomotive_page).should_not be_nil
         @controller.instance_variable_get(:@content_entry).should == @content_entry
       end
 
       it 'returns the 404 page if the instance does not exist' do
-        @content_type.entries.stubs(:where).returns([])
+        @page.stubs(:fetch_target_entry).returns(nil)
         (klass = Locomotive::Page).expects(:published).returns([true])
         @controller.current_site.pages.expects(:not_found).returns(klass)
         @controller.send(:locomotive_page).should be_true
@@ -149,7 +148,7 @@ describe 'Locomotive rendering system' do
 
       it 'returns the 404 page if the instance is not visible' do
         @content_entry._visible = false
-        @content_type.entries.stubs(:where).returns([@content_entry])
+        @page.stubs(:fetch_target_entry).returns(@content_entry)
         (klass = Locomotive::Page).expects(:published).returns([true])
         @controller.current_site.pages.expects(:not_found).returns(klass)
         @controller.send(:locomotive_page).should be_true

spec/lib/locomotive/routing/site_dispatcher_spec.rb

@@ -86,8 +86,8 @@ describe Locomotive::Routing::SiteDispatcher do
 
         @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
         @controller.expects(:current_site).returns(false)
-        @controller.stubs(:installation_url).returns('/admin/install/url/')
+        @controller.stubs(:installation_url).returns('/locomotive/install/url/')
-        @controller.stubs(:redirect_to).with('/admin/install/url/')
+        @controller.stubs(:redirect_to).with('/locomotive/install/url/')
       end
 
       it 'returns false' do
@@ -95,7 +95,7 @@ describe Locomotive::Routing::SiteDispatcher do
       end
 
       it 'redirects to the admin installation url' do
-        @controller.expects(:redirect_to).with('/admin/install/url/')
+        @controller.expects(:redirect_to).with('/locomotive/install/url/')
         @controller.send(:require_site)
       end
 
@@ -109,8 +109,8 @@ describe Locomotive::Routing::SiteDispatcher do
 
         @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
         @controller.expects(:current_site).returns(false)
-        @controller.stubs(:installation_url).returns('/admin/install/url/')
+        @controller.stubs(:installation_url).returns('/locomotive/install/url/')
-        @controller.stubs(:redirect_to).with('/admin/install/url/')
+        @controller.stubs(:redirect_to).with('/locomotive/install/url/')
       end
 
       it 'returns false' do
@@ -118,7 +118,7 @@ describe Locomotive::Routing::SiteDispatcher do
       end
 
       it 'redirects to the admin installation url' do
-        @controller.expects(:redirect_to).with('/admin/install/url/')
+        @controller.expects(:redirect_to).with('/locomotive/install/url/')
         @controller.send(:require_site)
       end
 
@@ -175,7 +175,7 @@ describe Locomotive::Routing::SiteDispatcher do
       @controller.stubs(:request).returns(@request)
       @controller.stubs(:current_locomotive_account).returns(@account)
       @controller.stubs(:sign_out).with(@account)
-      @controller.stubs(:new_session_url).returns('/new/admin/session')
+      @controller.stubs(:new_locomotive_account_session_url).returns('/locomotive/session/new')
     end
 
     context 'when a site is present' do
@@ -213,7 +213,7 @@ describe Locomotive::Routing::SiteDispatcher do
         end
 
         it 'redirects to the new session url' do
-          @controller.expects(:redirect_to).with('/new/admin/session')
+          @controller.expects(:redirect_to).with('/locomotive/session/new')
           @controller.send(:validate_site_membership)
         end
 
@@ -242,7 +242,7 @@ describe Locomotive::Routing::SiteDispatcher do
       end
 
       it 'redirects to the new session url' do
-        @controller.expects(:redirect_to).with('/new/admin/session')
+        @controller.expects(:redirect_to).with('/locomotive/session/new')
         @controller.send(:validate_site_membership)
       end
 

spec/requests/seo_trailing_slash_spec.rb

@@ -2,22 +2,18 @@ require 'spec_helper'
 
 describe 'Locomotive::Middlewares::SeoTrailingSlash' do
 
-  before(:all) do
-    Dummy::Application.instance.instance_variable_set(:@app, nil) # re-initialize the stack
-  end
-
   it 'does not process the "/" url' do
     get '/'
     response.status.should_not be(301)
   end
 
-  it 'does not process the "/admin/" url' do
+  it 'does not process the "/locomotive/" url' do
-    get '/admin/'
+    get '/locomotive/'
     response.status.should_not be(301)
   end
 
-  it 'does not process the "/admin/*" urls' do
+  it 'does not process the "/locomotive/*" urls' do
-    get '/admin/login'
+    get '/locomotive/login'
     response.status.should_not be(301)
   end