radiantcms-couchrest_model 0.1.4 → 0.1.5

data/spec/matchers/render_form_errors_matcher.rb

@@ -25,7 +25,7 @@ module Spec
                     :attributes => {:name => field_name}
                   },
                   :child => {
-                    :tag => 'span',
+                    :tag => 'small',
                     :attributes => {:class => 'error'},
                     :content => error_message
                   }

data/spec/matchers/render_matcher.rb

@@ -17,7 +17,6 @@ module Spec
             when @expected_error_message: false
             when @expected: @actual == @expected
             when @matching: @actual =~ @matching
-            when @not_matching: @actual !~ @not_matching
             else true
           end
         rescue => @actual_error
@@ -30,14 +29,7 @@ module Spec
         end
         
         def failure_message
-          action = case 
-          when @expected
-            "render as #{@expected.inspect}"
-          when @not_matching          
-            "render but not match #{@not_matching.inspect}"
-          else
-            "render and match #{@matching.inspect}"
-          end
+          action = @expected.nil? ? "render and match #{@matching.inspect}" : "render as #{@expected.inspect}"
           unless @error_thrown
             unless @expected_error_message
               if @content
@@ -71,11 +63,6 @@ module Spec
           self
         end
         
-        def not_matching(regexp)
-          @not_matching = regexp
-          self
-        end
-        
         def with_error(message)
           @expected_error_message = message
           self

data/spec/models/layout_spec.rb

@@ -10,11 +10,11 @@ describe Layout do
   
   it 'should validate presence of' do
     assert_valid :name, 'Just a Test'
-    assert_invalid :name, 'this must not be blank', nil, '', '  '
+    assert_invalid :name, 'required', nil, '', '  '
   end
   
   it 'should validate uniqueness of' do
-    assert_invalid :name, 'this name is already in use', 'Main'
+    assert_invalid :name, 'name already in use', 'Main'
     assert_valid :name, 'Something Else'
   end
   
@@ -22,7 +22,7 @@ describe Layout do
     {
       :name => 100
     }.each do |field, max|
-      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
+      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end

data/spec/models/page_part_spec.rb

@@ -32,21 +32,21 @@ describe PagePart do
       :name => 100,
       :filter_id => 25
     }.each do |field, max|
-      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
+      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end
   
   it 'should validate presence of' do
     [:name].each do |field|
-      assert_invalid field, 'this must not be blank', '', ' ', nil
+      assert_invalid field, 'required', '', ' ', nil
     end
   end
   
   it 'should validate numericality of' do
     [:id, :page_id].each do |field|
       assert_valid field, '1', '2'
-      assert_invalid field, 'this must be a number', 'abcd', '1,2', '1.3'
+      assert_invalid field, 'must be a number', 'abcd', '1,2', '1.3'
     end
   end
 end

data/spec/models/page_spec.rb

@@ -34,34 +34,34 @@ describe Page, 'validations' do
       :slug => 100,
       :breadcrumb => 160
     }.each do |field, max|
-      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
+      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end
 
   it 'should validate presence of' do
     [:title, :slug, :breadcrumb].each do |field|
-      assert_invalid field, 'this must not be blank', '', ' ', nil
+      assert_invalid field, 'required', '', ' ', nil
     end
   end
 
   it 'should validate format of' do
     @page.parent = pages(:home)
     assert_valid :slug, 'abc', 'abcd-efg', 'abcd_efg', 'abc.html', '/', '123'
-    assert_invalid :slug, 'this does not match the expected format', 'abcd efg', ' abcd', 'abcd/efg'
+    assert_invalid :slug, 'invalid format', 'abcd efg', ' abcd', 'abcd/efg'
   end
 
   it 'should validate numericality of' do
-    assert_invalid :status_id, 'this must not be blank', '', nil
+    assert_invalid :status_id, 'required', '', nil
     [:id, :status_id, :parent_id].each do |field|
       assert_valid field, '1', '2'
-      assert_invalid field, 'this must be a number', 'abcd', '1,2', '1.3'
+      assert_invalid field, 'must be a number', 'abcd', '1,2', '1.3'
     end
   end
 
   it 'should validate uniqueness of' do
     @page.parent = pages(:parent)
-    assert_invalid :slug, 'this slug is already in use by a sibling of this page', 'child', 'child-2', 'child-3'
+    assert_invalid :slug, 'slug already in use for child of parent', 'child', 'child-2', 'child-3'
     assert_valid :slug, 'child-4'
   end
 
@@ -177,8 +177,6 @@ describe Page do
     end
   end
 
-  # invalid, as published_at is set when form is submitted
-
   it 'should set published_at when published' do
     @page = Page.new(page_params(:status_id => '1', :published_at => nil))
     @page.published_at.should be_nil
@@ -207,33 +205,7 @@ describe Page do
     @page.status = Status[:draft]
     @page.published?.should be_false
   end
-  
-  it 'should answer false when not published but scheduled' do
-    @page.status = Status[:scheduled]
-    @page.published?.should be_false
-  end
 
-  it 'should change its status to scheduled when publishing in the future' do
-    @page = Page.new(page_params(:status_id => '100', :published_at => '2020-1-1'))
-    @page.save
-    @page.status_id.should == 90    
-  end
-
-  it 'should change its status to draft when set to draft' do
-    @page = pages(:scheduled)
-    @page.status_id = Status[:draft].id
-    @page.save
-    @page.status_id.should == 1    
-  end
-  
-  it 'should be published status when published_at is in the past' do
-    #current time 01-29-2010
-    scheduled_time = '2010-1-1'
-    @page = Page.new(page_params(:status_id => Status[:scheduled].id, :published_at => scheduled_time))
-    @page.save
-    @page.status_id.should == Status[:published].id
-  end
-  
   it "should answer the page's url" do
     @page = pages(:parent)
     @page.url.should == '/parent/'
@@ -489,13 +461,6 @@ describe Page, "class" do
     end
   end
 
-  it "should expose default page parts" do
-    override = PagePart.new(:name => 'override')
-    Page.stub!(:default_page_parts).and_return([override])
-    @page = Page.new_with_defaults({})
-    @page.parts.should eql([override])
-  end
-
   it 'should allow you to get the class name of a descendant class with a string' do
     ["", nil, "Page"].each do |value|
       Page.descendant_class(value).should == Page

data/spec/models/radiant/config_spec.rb

@@ -38,13 +38,13 @@ describe Radiant::Config do
   
   it "should update the mtime on the cache file after a record is saved" do
     FileUtils.should_receive(:mkpath).with("#{Rails.root}/tmp").at_least(:once)
-    FileUtils.should_receive(:touch).with(Radiant::Config.cache_file)
+    FileUtils.should_receive(:touch).with(Rails.cache.read('Radiant.cache_file'))
     Radiant::Config['mtime'] = 'now'
   end
   
   it "should record the cache file mtime when the cache is initialized" do
     Radiant::Config.initialize_cache
-    Rails.cache.read('Radiant.cache_mtime').should == File.mtime(Radiant::Config.cache_file)
+    Rails.cache.read('Radiant.cache_mtime').should == File.mtime(Rails.cache.fetch('Radiant.cache_file'))
   end
   
   it "should create a cache file when initializing the cache" do

data/spec/models/snippet_spec.rb

@@ -13,19 +13,19 @@ describe Snippet do
       :name => 100,
       :filter_id => 25
     }.each do |field, max|
-      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
+      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end
   
   it 'should validate presence of' do
     [:name].each do |field|
-      assert_invalid field, 'this must not be blank', '', ' ', nil
+      assert_invalid field, 'required', '', ' ', nil
     end
   end
   
   it 'should validate uniqueness of' do
-    assert_invalid :name, 'this name is already in use', 'first', 'another', 'markdown'
+    assert_invalid :name, 'name already in use', 'first', 'another', 'markdown'
     assert_valid :name, 'just-a-test'
   end
   

data/spec/models/standard_tags_spec.rb

@@ -63,7 +63,7 @@ describe "Standard Tags" do
     it 'should not list draft pages' do
       page.should render('<r:children:each by="title"><r:slug /> </r:children:each>').as('a b c d e f g h i j ')
     end
-
+    
     it 'should include draft pages with status="all"' do
       page.should render('<r:children:each status="all" by="slug"><r:slug /> </r:children:each>').as('a b c d draft e f g h i j ')
     end
@@ -72,36 +72,6 @@ describe "Standard Tags" do
       page.should render('<r:children:each by="slug"><r:slug /> </r:children:each>').as('a b c d draft e f g h i j ').on('dev.site.com')
     end
 
-    it 'should not list draft pages on dev.site.com when Radiant::Config["dev.host"] is set to something else' do
-      Radiant::Config['dev.host'] = 'preview.site.com'
-      page.should render('<r:children:each by="title"><r:slug /> </r:children:each>').as('a b c d e f g h i j ').on('dev.site.com')
-    end
-
-    describe 'with paginated="true"' do
-      it 'should limit correctly the result set' do
-        page.pagination_parameters = {:page => 1, :per_page => 10}
-        page.should render('<r:children:each paginated="true" per_page="10"><r:slug /> </r:children:each>').as('a b c d e f g h i j ')
-        page.should render('<r:children:each paginated="true" per_page="2"><r:slug /> </r:children:each>').not_matching(/a b c/)
-      end
-      it 'should display a pagination control block' do
-        page.pagination_parameters = {:page => 1, :per_page => 1}
-        page.should render('<r:children:each paginated="true"><r:slug /> </r:children:each>').matching(/div class="pagination"/)
-      end
-      it 'should link to the correct paginated page' do
-        page(:another)
-        page.pagination_parameters = {:page => 1, :per_page => 1}
-        page.should render('<r:find url="/assorted"><r:children:each paginated="true"><r:slug /> </r:children:each></r:find>').matching(%r{href="/another})
-      end
-      it 'should pass through selected will_paginate parameters' do
-        page(:assorted)
-        page.pagination_parameters = {:page => 5, :per_page => 1}
-        page.should render('<r:children:each paginated="true" separator="not that likely a choice"><r:slug /> </r:children:each>').matching(/not that likely a choice/)
-        page.should render('<r:children:each paginated="true" previous_label="before"><r:slug /> </r:children:each>').matching(/before/)
-        page.should render('<r:children:each paginated="true" next_label="after"><r:slug /> </r:children:each>').matching(/after/)
-        page.should render('<r:children:each paginated="true" inner_window="1" outer_window="0"><r:slug /> </r:children:each>').not_matching(/\?p=2/)
-      end
-    end
-    
     it 'should error with invalid "limit" attribute' do
       message = "`limit' attribute of `each' tag must be a positive number between 1 and 4 digits"
       page.should render(page_children_each_tags(%{limit="a"})).with_error(message)
@@ -227,7 +197,7 @@ describe "Standard Tags" do
     it 'should render the number of children of the current page' do
       page(:parent).should render('<r:children:count />').as('3')
     end
-
+    
     it "should accept the same scoping conditions as <r:children:each>" do
       page.should render('<r:children:count />').as('10')
       page.should render('<r:children:count status="all" />').as('11')
@@ -292,14 +262,6 @@ describe "Standard Tags" do
       page(:recursive_parts).should render('<r:content part="two"/>').with_error("Recursion error: already rendering the `two' part.")
     end
 
-    it "should allow repetition" do
-      page(:recursive_parts).should render('<r:content part="repeat"/>').as('xx')
-    end
-
-    it "should not prevent rendering a part more than once in sequence" do
-      page(:home).should render('<r:content /><r:content />').as('Hello world!Hello world!')
-    end
-
     describe "with inherit attribute" do
       it "missing or set to 'false' should render the current page's part" do
         page.should render('<r:content part="sidebar" />').as('')
@@ -345,7 +307,7 @@ describe "Standard Tags" do
   end
 
   describe "<r:if_content>" do
-
+ 
     it "without 'part' attribute should render the contained block if the 'body' part exists" do
       page.should render('<r:if_content>true</r:if_content>').as('true')
     end
@@ -359,40 +321,29 @@ describe "Standard Tags" do
     end
 
     describe "with more than one part given (separated by comma)" do
-
+      
       it "should render the contained block only if all specified parts exist" do
         page(:home).should render('<r:if_content part="body, extended">true</r:if_content>').as('true')
       end
-
+    
       it "should not render the contained block if at least one of the specified parts does not exist" do
         page(:home).should render('<r:if_content part="body, madeup">true</r:if_content>').as('')
       end
-
+      
       describe "with inherit attribute set to 'true'" do
         it 'should render the contained block if the current or ancestor pages have the specified parts' do
           page(:guests).should render('<r:if_content part="favors, extended" inherit="true">true</r:if_content>').as('true')
         end
-
+      
         it 'should not render the contained block if the current or ancestor pages do not have all of the specified parts' do
           page(:guests).should render('<r:if_content part="favors, madeup" inherit="true">true</r:if_content>').as('')
         end
-        
-        describe "with find attribute set to 'any'" do
-          it 'should render the contained block if the current or ancestor pages have any of the specified parts' do
-            page(:guests).should render('<r:if_content part="favors, madeup" inherit="true" find="any">true</r:if_content>').as('true')
-          end
-          
-          it 'should still render the contained block if first of the specified parts has not been found' do
-            page(:guests).should render('<r:if_content part="madeup, favors" inherit="true" find="any">true</r:if_content>').as('true')
-          end
-        end
       end
-      
       describe "with inherit attribute set to 'false'" do
         it 'should render the contained block if the current page has the specified parts' do
           page(:guests).should render('<r:if_content part="favors, games" inherit="false">true</r:if_content>').as('')
         end
-
+      
         it 'should not render the contained block if the current or ancestor pages do not have all of the specified parts' do
           page(:guests).should render('<r:if_content part="favors, madeup" inherit="false">true</r:if_content>').as('')
         end
@@ -406,7 +357,7 @@ describe "Standard Tags" do
         it "should render the contained block if all of the specified parts exist" do
           page(:home).should render('<r:if_content part="body, sidebar" find="all">true</r:if_content>').as('true')
         end
-
+        
         it "should not render the contained block if all of the specified parts do not exist" do
           page.should render('<r:if_content part="asdf, madeup" find="all">true</r:if_content>').as('')
         end
@@ -419,7 +370,7 @@ describe "Standard Tags" do
       it 'should not render the contained block if the current or ancestor pages have the specified parts' do
         page(:guests).should render('<r:unless_content part="favors, extended" inherit="true">true</r:unless_content>').as('')
       end
-
+      
       it 'should render the contained block if the current or ancestor pages do not have the specified parts' do
         page(:guests).should render('<r:unless_content part="madeup, imaginary" inherit="true">true</r:unless_content>').as('true')
       end
@@ -427,18 +378,8 @@ describe "Standard Tags" do
       it "should not render the contained block if the specified part does not exist but does exist on an ancestor" do
         page.should render('<r:unless_content part="sidebar" inherit="true">false</r:unless_content>').as('')
       end
-      
-      describe "with find attribute set to 'any'" do
-        it 'should not render the contained block if the current or ancestor pages have any of the specified parts' do
-          page(:guests).should render('<r:unless_content part="favors, madeup" inherit="true" find="any">true</r:unless_content>').as('')
-        end
-        
-        it 'should still not render the contained block if first of the specified parts has not been found' do
-          page(:guests).should render('<r:unless_content part="madeup, favors" inherit="true" find="any">true</r:unless_content>').as('')
-        end
-      end
     end
-
+    
     it "without 'part' attribute should not render the contained block if the 'body' part exists" do
       page.should render('<r:unless_content>false</r:unless_content>').as('')
     end
@@ -454,27 +395,27 @@ describe "Standard Tags" do
     it "should render the contained block if the specified part does not exist but does exist on an ancestor" do
       page.should render('<r:unless_content part="sidebar">false</r:unless_content>').as('false')
     end
-
+    
     describe "with more than one part given (separated by comma)" do
-
+    
       it "should not render the contained block if all of the specified parts exist" do
         page(:home).should render('<r:unless_content part="body, extended">true</r:unless_content>').as('')
       end
-
+    
       it "should render the contained block if at least one of the specified parts exists" do
         page(:home).should render('<r:unless_content part="body, madeup">true</r:unless_content>').as('true')
       end
-
+      
       describe "with the 'inherit' attribute set to 'true'" do
         it "should render the contained block if the current or ancestor pages have none of the specified parts" do
           page.should render('<r:unless_content part="imaginary, madeup" inherit="true">true</r:unless_content>').as('true')
         end
-
+        
         it "should not render the contained block if all of the specified parts are present on the current or ancestor pages" do
           page(:party).should render('<r:unless_content part="favors, extended" inherit="true">true</r:unless_content>').as('')
         end
       end
-
+      
       describe "with the 'find' attribute set to 'all'" do
         it "should not render the contained block if all of the specified parts exist" do
           page(:home).should render('<r:unless_content part="body, sidebar" find="all">true</r:unless_content>').as('')
@@ -484,7 +425,7 @@ describe "Standard Tags" do
           page.should render('<r:unless_content part="body, madeup" find="all">true</r:unless_content>').as('true')
         end
       end
-
+      
       describe "with the 'find' attribute set to 'any'" do
         it "should not render the contained block if any of the specified parts exist" do
           page.should render('<r:unless_content part="body, madeup" find="any">true</r:unless_content>').as('')
@@ -493,51 +434,6 @@ describe "Standard Tags" do
     end
   end
 
-  describe "<r:aggregate>" do
-    it "should raise an error when given no 'urls' attribute" do
-      pages(:home).should render('<r:aggregate></r:aggregate>').with_error("`urls' attribute required")
-    end
-    it "should expand its contents with a given 'urls' attribute formatted as '/url1; /url2;'" do
-      pages(:home).should render('<r:aggregate urls="/parent/child; /first;">true</r:aggregate>').as('true')
-    end
-  end
-  
-  describe "<r:aggregate:children>" do
-    it "should expand its contents" do
-      pages(:home).should render('<r:aggregate urls="/parent/child; /first;"><r:children>true</r:children></r:aggregate>').as('true') 
-    end
-  end
-  
-  describe "<r:aggregate:children:count>" do
-    it "should display the number of aggregated children" do
-      pages(:home).should render('<r:aggregate urls="/news; /assorted"><r:children:count /></r:aggregate>').as('14')
-    end
-  end
-  
-  describe "<r:aggregate:children:each>" do
-    it "should loop through each child from the given urls" do
-      pages(:home).should render('<r:aggregate urls="/parent; /news"><r:children:each><r:title/> </r:children:each></r:aggregate>').as('Article Article 2 Article 3 Article 4 Child Child 2 Child 3 ')
-    end
-    it "should sort the children by the given 'by' attribute" do
-      pages(:home).should render('<r:aggregate urls="/assorted; /news"><r:children:each by="slug"><r:slug /> </r:children:each></r:aggregate>').as('a article article-2 article-3 article-4 b c d e f g h i j ')
-    end
-    it "should order the children by the given 'order' attribute when used with 'by'" do
-      pages(:home).should render('<r:aggregate urls="/assorted; /news"><r:children:each by="slug" order="desc"><r:slug /> </r:children:each></r:aggregate>').as('j i h g f e d c b article-4 article-3 article-2 article a ')
-    end
-    it "should limit the number of results with the given 'limit' attribute" do
-      pages(:home).should render('<r:aggregate urls="/assorted; /news"><r:children:each by="slug" order="desc" limit="3"><r:slug /> </r:children:each></r:aggregate>').as('j i h ')
-    end
-  end
-  
-  describe "<r:aggregate:each>" do
-    it "should loop through each of the given aggregate urls" do
-      pages(:home).should render('<r:aggregate urls="/parent/child; /first; /assorted;"><r:each><r:title /> </r:each></r:aggregate>').as('Child First Assorted ')
-    end
-    it "should display it's contents in the scope of the individually aggregated page" do
-      pages(:home).should render('<r:aggregate urls="/parent; /news; /assorted;"><r:each><r:children:each><r:title /> </r:children:each></r:each></r:aggregate>').as('Child Child 2 Child 3 Article Article 2 Article 3 Article 4 a b c d e f g h i j ')
-    end
-  end
-
   describe "<r:author>" do
     it "should render the author of the current page" do
       page.should render('<r:author />').as('Admin')
@@ -548,28 +444,6 @@ describe "Standard Tags" do
     end
   end
 
-  describe "<r:gravatar>" do
-    it "should render the Gravatar URL of author of the current page" do
-      page.should render('<r:gravatar />').as('http://www.gravatar.com/avatar.php?gravatar_id=e64c7d89f26bd1972efa854d13d7dd61&rating=G&size=32')
-    end
-
-    it "should render the Gravatar URL of the name user" do
-      page.should render('<r:gravatar name="Admin" />').as('http://www.gravatar.com/avatar.php?gravatar_id=e64c7d89f26bd1972efa854d13d7dd61&rating=G&size=32')
-    end
-
-    it "should render the default avatar when the user has not set an email address" do
-      page.should render('<r:gravatar name="Designer" />').as('http://testhost.tld/images/admin/avatar_32x32.png')
-    end
-
-    it "should render the specified size" do
-      page.should render('<r:gravatar name="Designer" size="96px" />').as('http://testhost.tld/images/admin/avatar_96x96.png')
-    end
-
-    it "should render the specified rating" do
-      page.should render('<r:gravatar rating="X" />').as('http://www.gravatar.com/avatar.php?gravatar_id=e64c7d89f26bd1972efa854d13d7dd61&rating=X&size=32')
-    end
-  end
-
   describe "<r:date>" do
     before :each do
       page(:dated)
@@ -674,7 +548,7 @@ describe "Standard Tags" do
       page.should render('<r:snippet name="yielding">inner</r:snippet>').
         as('Before...inner...and after')
     end
-
+    
     it "should do nothing with contents of double tag when snippet doesn't yield" do
       page.should render('<r:snippet name="first">content disappears!</r:snippet>').
         as('test')
@@ -684,12 +558,12 @@ describe "Standard Tags" do
       page.should render('<r:snippet name="div_wrap"><r:snippet name="yielding">Hello, World!</r:snippet></r:snippet>').
       as('<div>Before...Hello, World!...and after</div>')
     end
-
+    
     it "should render double-tag snippets called from within a snippet" do
       page.should render('<r:snippet name="nested_yields">the content</r:snippet>').
         as('<snippet name="div_wrap">above the content below</snippet>')
     end
-
+    
     it "should render contents each time yield is called" do
       page.should render('<r:snippet name="yielding_often">French</r:snippet>').
         as('French is Frencher than French')
@@ -703,7 +577,7 @@ describe "Standard Tags" do
   it '<r:random> should render a randomly selected contained <r:option>' do
     page.should render("<r:random> <r:option>1</r:option> <r:option>2</r:option> <r:option>3</r:option> </r:random>").matching(/^(1|2|3)$/)
   end
-
+  
   it '<r:random> should render a randomly selected, dynamically set <r:option>' do
     page(:parent).should render("<r:random:children:each:option:title />").matching(/^(Child|Child\ 2|Child\ 3)$/)
   end
@@ -777,36 +651,6 @@ describe "Standard Tags" do
       expected = %{<strong><a href="/">Home: Boy</a></strong> | <a href="/archive/">Archives</a> | <a href="/documentation/">Docs</a>}
       page(:radius).should render(tags).as(expected)
     end
-
-    it 'should render text under <r:if_first> and <r:if_last> only on the first and last item, respectively' do
-      tags = %{<r:navigation urls="Home: / | Assorted: /assorted | Parent: /parent | Radius: /radius">
-                 <r:normal><r:if_first>(</r:if_first><a href="<r:url />"><r:title /></a><r:if_last>)</r:if_last></r:normal>
-                 <r:here><r:if_first>(</r:if_first><r:title /><r:if_last>)</r:if_last></r:here>
-                 <r:selected><r:if_first>(</r:if_first><strong><a href="<r:url />"><r:title /></a></strong><r:if_last>)</r:if_last></r:selected>
-               </r:navigation>}
-      expected = %{(<strong><a href=\"/\">Home</a></strong> <a href=\"/assorted\">Assorted</a> <a href=\"/parent\">Parent</a> Radius)}
-      page(:radius).should render(tags).as(expected)
-    end
-
-    it 'should render text under <r:unless_first> on every item but the first' do
-      tags = %{<r:navigation urls="Home: / | Assorted: /assorted | Parent: /parent | Radius: /radius">
-                 <r:normal><r:unless_first>&gt; </r:unless_first><a href="<r:url />"><r:title /></a></r:normal>
-                 <r:here><r:unless_first>&gt; </r:unless_first><r:title /></r:here>
-                 <r:selected><r:unless_first>&gt; </r:unless_first><strong><a href="<r:url />"><r:title /></a></strong></r:selected>
-               </r:navigation>}
-      expected = %{<strong><a href=\"/\">Home</a></strong> &gt; <a href=\"/assorted\">Assorted</a> &gt; <a href=\"/parent\">Parent</a> &gt; Radius}
-      page(:radius).should render(tags).as(expected)
-    end
-
-    it 'should render text under <r:unless_last> on every item but the last' do
-      tags = %{<r:navigation urls="Home: / | Assorted: /assorted | Parent: /parent | Radius: /radius">
-                 <r:normal><a href="<r:url />"><r:title /></a><r:unless_last> &gt;</r:unless_last></r:normal>
-                 <r:here><r:title /><r:unless_last> &gt;</r:unless_last></r:here>
-                 <r:selected><strong><a href="<r:url />"><r:title /></a></strong><r:unless_last> &gt;</r:unless_last></r:selected>
-               </r:navigation>}
-      expected = %{<strong><a href=\"/\">Home</a></strong> &gt; <a href=\"/assorted\">Assorted</a> &gt; <a href=\"/parent\">Parent</a> &gt; Radius}
-      page(:radius).should render(tags).as(expected)
-    end
   end
 
   describe "<r:find>" do
@@ -967,10 +811,6 @@ describe "Standard Tags" do
     it "should not render the contained block when not on the dev site" do
       page.should render('-<r:if_dev>dev</r:if_dev>-').as('--')
     end
-    
-    it "should not render the contained block when no request is present" do
-      page(:devtags).render_part('if_dev').should_not have_text('dev')
-    end
 
     describe "on an included page" do
       it "should render the contained block when on the dev site" do
@@ -992,10 +832,6 @@ describe "Standard Tags" do
       page.should render('-<r:unless_dev>not dev</r:unless_dev>-').as('-not dev-')
     end
 
-    it "should render the contained block when no request is present" do
-      page(:devtags).render_part('unless_dev').should have_text('not dev')
-    end
-
     describe "on an included page" do
       it "should not render the contained block when not on the dev site" do
         page.should render('-<r:find url="/devtags/"><r:content part="unless_dev" /></r:find>-').as('--').on('dev.site.com')
@@ -1034,7 +870,7 @@ describe "Standard Tags" do
       page(:parent).should render(%{<r:find url="/radius"><r:if_ancestor_or_self>true</r:if_ancestor_or_self></r:find>}).as('')
     end
   end
-
+  
   describe "<r:unless_ancestor_or_self>" do
     it "should render the tag's content when the current page is not an ancestor of tag.locals.page" do
       page(:parent).should render(%{<r:find url="/radius"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('true')
@@ -1054,7 +890,7 @@ describe "Standard Tags" do
       page(:radius).should render(%{<r:find url="/"><r:if_self>true</r:if_self></r:find>}).as('')
     end
   end
-
+  
   describe "<r:unless_self>" do
     it "should render the tag's content when the current page is not the same as the local contextual page" do
       page(:radius).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('true')
@@ -1134,7 +970,7 @@ describe "Standard Tags" do
         @page = pages(symbol)
       end
     end
-
+    
     def page_children_each_tags(attr = nil)
       attr = ' ' + attr unless attr.nil?
       "<r:children:each#{attr}><r:slug /> </r:children:each>"
@@ -1153,4 +989,4 @@ describe "Standard Tags" do
     def page_eachable_children(page)
       page.children.select(&:published?).reject(&:virtual)
     end
-end
+end