Changeset 827

Show
Ignore:
Timestamp:
04/19/08 11:36:12 (3 months ago)
Author:
seancribbs
Message:

Fix broken specs and regression.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/radiant/app/models/page.rb

    r813 r827  
    4545  end 
    4646  alias_method_chain :layout, :inheritance 
     47   
     48  def description 
     49    self["description"] 
     50  end 
     51   
     52  def description=(value) 
     53    self["description"] = value 
     54  end 
    4755   
    4856  def cache? 

  • trunk/radiant/spec/models/standard_tags_spec.rb

    r826 r827  
    557557  describe "<r:meta>" do 
    558558    it "should render <meta> tags for the description and keywords" do 
    559       page(:home).should render('<r:meta/>').as(%{<meta rel="description" content="The homepage" /><meta rel="keywords" content="Home, Page" />}) 
     559      page(:home).should render('<r:meta/>').as(%{<meta name="description" content="The homepage" /><meta name="keywords" content="Home, Page" />}) 
    560560    end 
    561561     
    562562    it "should render <meta> tags with escaped values for the description and keywords" do 
    563       page.should render('<r:meta/ >').as(%{<meta rel="description" content="sweet &amp; harmonious biscuits" /><meta rel="keywords" content="sweet &amp; harmonious biscuits" />}) 
     563      page.should render('<r:meta/>').as(%{<meta name="description" content="sweet &amp; harmonious biscuits" /><meta name="keywords" content="sweet &amp; harmonious biscuits" />}) 
    564564    end 
    565565 
    …… 
    577577  describe "<r:meta:description>" do 
    578578    it "should render a <meta> tag for the description" do 
    579       page(:home).should render('<r:meta:description/>').as(%{<meta rel="description" content="The homepage" />}) 
     579      page(:home).should render('<r:meta:description/>').as(%{<meta name="description" content="The homepage" />}) 
    580580    end 
    581581     
    582582    it "should render a <meta> tag with escaped value for the description" do 
    583       page.should render('<r:meta/ >').as(%{<meta rel="description" content="sweet &amp; harmonious biscuits" />}) 
     583      page.should render('<r:meta:description />').as(%{<meta name="description" content="sweet &amp; harmonious biscuits" />}) 
    584584    end 
    585585 
    …… 
    597597  describe "<r:meta:keywords>" do 
    598598    it "should render a <meta> tag for the keywords" do 
    599       page(:home).should render('<r:meta:keywords/>').as(%{<meta rel="keywords" content="Home, Page" />}) 
     599      page(:home).should render('<r:meta:keywords/>').as(%{<meta name="keywords" content="Home, Page" />}) 
    600600    end 
    601601     
    602602    it "should render a <meta> tag with escaped value for the keywords" do 
    603       page.should render('<r:meta/ >').as(%{<meta rel="keywords" content="sweet &amp; harmonious biscuits" />}) 
     603      page.should render('<r:meta:keywords />').as(%{<meta name="keywords" content="sweet &amp; harmonious biscuits" />}) 
    604604    end 
    605605 

  • trunk/radiant/spec/scenarios/home_page_scenario.rb

    r826 r827  
    44    create_page "Home", :slug => "/", :parent_id => nil,  
    55                        :description => "The homepage",  
    6                         :keywords => "home, page" do 
     6                        :keywords => "Home, Page" do 
    77      create_page_part "body", :content => "Hello world!" 
    88      create_page_part "sidebar", :content => "<r:title /> sidebar."