erector 0.9.0.pre1 → 0.9.0

data/spec/rails_root/spec/rails_helpers_spec.rb

@@ -119,6 +119,14 @@ describe Erector::Rails do
     end
   end
 
+  describe "#favicon_link_tag" do
+    it "renders tag" do
+      test_render do
+        favicon_link_tag("rails.ico")
+      end.should == %{<link href="/images/rails.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />}
+    end
+  end
+
   describe "#image_tag" do
     it "renders tag" do
       test_render do

data/spec/rails_root/spec/render_spec.rb

@@ -162,6 +162,21 @@ describe ActionController::Base do
       @bar = "bar"
       render :widget => NeedsWidget
     end
+    
+    def render_with_widget_as_layout
+      render :layout => "layouts/widget_as_layout"
+    end
+    
+    def render_with_widget_as_layout_and_vars
+      @before = "Breakfast"
+      @during = "Lunch"
+      @after = "Dinner"
+      render :template => "test/render_with_widget_as_layout", :layout => "layouts/widget_as_layout"
+    end
+    
+    def render_with_widget_as_layout_using_content_for
+      render :template => "test/render_with_widget_as_layout_using_content_for", :layout => "layouts/widget_as_layout"
+    end
   end
 
   class TestWidget < Erector::Widget
@@ -210,7 +225,7 @@ describe ActionController::Base do
     end
     
     it "should raise when rendering a widget class with implicit assigns and too many variables" do
-      proc { test_action(:render_widget_with_extra_controller_variables) }.should raise_error(RuntimeError, /Excess parameters?.*: .*baz/)
+      proc { test_action(:render_widget_with_extra_controller_variables) }.should raise_error(ArgumentError, /Excess parameters?.*: .*baz/)
     end
 
     it "should render a specific content method" do
@@ -294,5 +309,18 @@ describe ActionController::Base do
     it "should allow rendering widget with needs" do
       proc { test_action(:render_with_needs) }.should_not raise_error
     end
+    
+    it "should allow using a widget as a layout" do
+      test_action(:render_with_widget_as_layout).should == "BEFOREDURINGAFTER"
+    end
+
+    it "should allow using a widget as a layout with instance vars" do
+      test_action(:render_with_widget_as_layout_and_vars).should == "BreakfastLunchDinner"
+    end
+
+    it "should allow using a widget as a layout using content_for" do
+      test_action(:render_with_widget_as_layout_using_content_for).should == "TOPBEFOREDURINGAFTER"
+    end
+
   end
 end

data/spec/web/article_spec.rb

@@ -0,0 +1,234 @@
+here = File.dirname(__FILE__)
+require File.expand_path("#{here}/../spec_helper")
+
+$: << File.expand_path("#{here}/../../web/")
+require "article"
+
+describe Article do
+  it "requires a name" do
+    lambda {
+      Article.new
+    }.should raise_error(ArgumentError)
+
+    a = Article.new(:name => "Foo")
+    assert { a.instance_variable_get(:@name) == "Foo" }
+  end
+  
+  it "renders a name" do
+    a = Article.new(:name => "Foo")
+    a.to_html.should == "<div class=\"article\"><h1 class=\"name\">Foo</h1></div>"
+  end
+
+  it "defaults to empty sections" do
+    a = Article.new(:name => "Foo")
+    assert { a.instance_variable_get(:@sections) == [] }
+  end
+  
+  it "allows sections" do
+    a = Article.new(:name => "Foo", :sections => [w = Erector::Widget.new])
+    assert { a.instance_variable_get(:@sections) == [w] }
+  end
+  
+  it "allows adding sections later" do
+    a = Article.new(:name => "Foo")
+    a << (w = Section.new(:name => "Bar"))
+    assert { a.instance_variable_get(:@sections) == [w] }
+  end
+  
+  it "returns self from <<, to allow chaining" do
+    a = Article.new(:name => "Foo")
+    val = a << (w = Erector::Widget.new)
+    assert { val == a }
+  end  
+  
+  it "allows adding sections via a method call" do
+    a = Article.new(:name => "Foo")
+    a.add(:name => "Bar") do
+      p.bar!
+    end
+    s = a.instance_variable_get(:@sections)
+    assert { s.size == 1 }
+    assert { s.first.name == "Bar" }
+    assert { s.first.to_html == "<p id=\"bar\"></p>" }
+  end
+  
+  describe "with contents" do
+    before do
+      @article = Article.new(:name => "Gnome Plan")
+      @article << Section.new(:name => "Steal Underpants") do
+        p "very important"
+      end
+
+      @article << Section.new(:name => "?", :href => "question") do
+        p "todo"
+      end
+
+      @article << Section.new(:name => "Profit!") do
+        p "victory"
+      end
+    end
+    
+    it "shows a table of contents" do
+      @article.to_html =~ /<div class=\"toc\">/
+    end
+
+    it "toc contains each section's name and a link to its href" do
+      @article.to_html(:content_method_name => "table_of_contents", :prettyprint => true).should == <<-HTML
+<div class="toc">
+  <h2>Table of Contents</h2>
+  <ol class="toc">
+    <li><a href="#stealunderpants">Steal Underpants</a></li>
+    <li><a href="#question">?</a></li>
+    <li><a href="#profit">Profit!</a></li>
+  </ol>
+</div>
+<div class="clear"></div>
+      HTML
+    end
+    
+    it "shows each section" do
+      @article.to_html(:content_method_name => "emit_sections", :prettyprint => true).should == <<-HTML
+<div class="sections">
+  <a name="stealunderpants"></a>
+  <h2>1. Steal Underpants</h2>
+  <p>very important</p>
+  <a name="question"></a>
+  <h2>2. ?</h2>
+  <p>todo</p>
+  <a name="profit"></a>
+  <h2>3. Profit!</h2>
+  <p>victory</p>
+</div>
+      HTML
+    end
+  end
+  
+  describe "with subsections" do
+    
+    before do
+      @article = Article.new(:name => "Food")
+      @article << 
+        Section.new(:name => "Breakfast") { p "very important" }.tap do |s|
+           s << Section.new(:name => "Coffee") { p "french roast" }
+           s << Section.new(:name => "Eggs") { p "scrambled" }
+        end
+    end
+    
+    it "toc contains each section's name and a link to its href" do
+      @article.to_html(:content_method_name => "table_of_contents", :prettyprint => true).should == <<-HTML
+<div class="toc">
+  <h2>Table of Contents</h2>
+  <ol class="toc">
+    <li><a href="#breakfast">Breakfast</a>
+      <ol class="toc">
+        <li><a href="#coffee">Coffee</a></li>
+        <li><a href="#eggs">Eggs</a></li>
+      </ol>
+    </li>
+  </ol>
+</div>
+<div class="clear"></div>
+      HTML
+    end
+
+    it "shows each section" do
+      @article.to_html(:content_method_name => "emit_sections", :prettyprint => true).should == <<-HTML
+<div class="sections">
+  <a name="breakfast"></a>
+  <h2>1. Breakfast</h2>
+  <p>very important</p>
+  <div class="sections">
+    <a name="coffee"></a>
+    <h3>1.1. Coffee</h3>
+    <p>french roast</p>
+    <a name="eggs"></a>
+    <h3>1.2. Eggs</h3>
+    <p>scrambled</p>
+  </div>
+</div>
+      HTML
+    end
+  end
+  
+  it "can be created using nested taps and adds" do
+    article = Article.new(:name => "food").tap { |a|
+      a.add(:name => "fruit") {
+        text "sweet and fibrous"
+      }.tap { |s|
+        s.add(:name => "apple") {
+          text "crunchy"
+        }.tap { |s|
+          s.add(:name => "granny smith") {
+            text "green"
+          }
+          s.add(:name => "red delicious") {
+            text "red"
+          }
+        }
+        s.add(:name => "banana") {
+          text "yellow"
+        }
+      }
+      a.add(:name => "bread") {
+        text "chewy and grainy"
+      }.tap { |s|
+        s.add(:name => "sourdough") {
+          text "tangy"
+        }
+      }
+    }
+    
+    article.to_html(:prettyprint => true).should == <<-HTML
+<div class="article">
+  <h1 class="name">food</h1>
+  <div class="toc">
+    <h2>Table of Contents</h2>
+    <ol class="toc">
+      <li><a href="#fruit">fruit</a>
+        <ol class="toc">
+          <li><a href="#apple">apple</a>
+            <ol class="toc">
+              <li><a href="#grannysmith">granny smith</a></li>
+              <li><a href="#reddelicious">red delicious</a></li>
+            </ol>
+          </li>
+          <li><a href="#banana">banana</a></li>
+        </ol>
+      </li>
+      <li><a href="#bread">bread</a>
+        <ol class="toc">
+          <li><a href="#sourdough">sourdough</a></li>
+        </ol>
+      </li>
+    </ol>
+  </div>
+  <div class="clear"></div>
+  <div class="sections">
+    <a name="fruit"></a>
+    <h2>1. fruit</h2>
+    sweet and fibrous
+    <div class="sections">
+      <a name="apple"></a>
+      <h3>1.1. apple</h3>
+      crunchy
+      <div class="sections">
+        <a name="grannysmith"></a>
+        <h4>1.1.1. granny smith</h4>
+        green<a name="reddelicious"></a>
+        <h4>1.1.2. red delicious</h4>
+        red</div>
+      <a name="banana"></a>
+      <h3>1.2. banana</h3>
+      yellow</div>
+    <a name="bread"></a>
+    <h2>2. bread</h2>
+    chewy and grainy
+    <div class="sections">
+      <a name="sourdough"></a>
+      <h3>2.1. sourdough</h3>
+      tangy</div>
+  </div>
+</div>
+    HTML
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: erector
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre1
-  prerelease: 6
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Alex Chaffee
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-23 00:00:00.000000000Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2165518380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,15 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2165518380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2165517640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +41,15 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2165517640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165516760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +57,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2165516760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: &2165515900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +73,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165515900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2165515180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +89,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165515180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165514340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +105,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165514340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165513500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,10 +121,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165513500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2165512700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,10 +137,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165512700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2165511820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -113,10 +153,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165511820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &2165511060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,21 +169,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165511060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2165510240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *2165510240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: wrong
-  requirement: &2165509440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -146,7 +201,12 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2165509440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 description: Erector is a Builder-like view framework, inspired by Markaby but overcoming
   some of its flaws. In Erector all views are objects, not template files, which allows
   the full power of object-oriented programming (inheritance, modular decomposition,
@@ -158,6 +218,7 @@ extensions: []
 extra_rdoc_files:
 - README.txt
 files:
+- .gemtest
 - README.txt
 - VERSION.yml
 - bin/erector
@@ -246,6 +307,8 @@ files:
 - spec/rails2/erect_rails_spec.rb
 - spec/rails2/rails_app/app/controllers/application_controller.rb
 - spec/rails2/rails_app/app/helpers/application_helper.rb
+- spec/rails2/rails_app/app/helpers/rails_helpers_spec_helper.rb
+- spec/rails2/rails_app/app/helpers/test_helper.rb
 - spec/rails2/rails_app/app/views/test/_erb.erb
 - spec/rails2/rails_app/app/views/test/_erector.rb
 - spec/rails2/rails_app/app/views/test/_partial_with_locals.rb
@@ -313,31 +376,11 @@ files:
 - spec/rails2/rails_app/spec/render_spec.rb
 - spec/rails2/rails_app/test/performance/browsing_test.rb
 - spec/rails2/rails_app/test/test_helper.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/init.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/tasks/rails_xss_tasks.rake
-- spec/rails2/rails_app/vendor/plugins/rails_xss/MIT-LICENSE
-- spec/rails2/rails_app/vendor/plugins/rails_xss/Rakefile
-- spec/rails2/rails_app/vendor/plugins/rails_xss/README.markdown
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/active_record_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/caching_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/date_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/erb_util_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_tag_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/output_safety_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/rails_xss_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/test_helper.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/text_helper_test.rb
 - spec/rails_root/app/controllers/application.rb
 - spec/rails_root/app/controllers/application_controller.rb
 - spec/rails_root/app/helpers/application_helper.rb
 - spec/rails_root/app/views/layouts/application.html.erb
+- spec/rails_root/app/views/layouts/widget_as_layout.rb
 - spec/rails_root/app/views/test/_erb.erb
 - spec/rails_root/app/views/test/_erector.rb
 - spec/rails_root/app/views/test/_partial_with_locals.rb
@@ -351,6 +394,8 @@ files:
 - spec/rails_root/app/views/test/protected_instance_variable.html.rb
 - spec/rails_root/app/views/test/render_default.html.rb
 - spec/rails_root/app/views/test/render_partial.html.rb
+- spec/rails_root/app/views/test/render_with_widget_as_layout.rb
+- spec/rails_root/app/views/test/render_with_widget_as_layout_using_content_for.rb
 - spec/rails_root/config/application.rb
 - spec/rails_root/config/boot.rb
 - spec/rails_root/config/database.yml
@@ -369,7 +414,7 @@ files:
 - spec/rails_root/db/seeds.rb
 - spec/rails_root/doc/README_FOR_APP
 - spec/rails_root/Gemfile
-- spec/rails_root/log/development.log
+- spec/rails_root/Gemfile.lock
 - spec/rails_root/log/test.log
 - spec/rails_root/public/404.html
 - spec/rails_root/public/422.html
@@ -411,6 +456,7 @@ files:
 - spec/rails_root/test/performance/browsing_test.rb
 - spec/rails_root/test/test_helper.rb
 - spec/spec_helper.rb
+- spec/web/article_spec.rb
 homepage: http://erector.rubyforge.org/
 licenses: []
 post_install_message: 
@@ -425,16 +471,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2103254179861366660
+      hash: -2251215620609429696
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HTML/XML Builder library
@@ -472,6 +518,8 @@ test_files:
 - spec/rails2/erect_rails_spec.rb
 - spec/rails2/rails_app/app/controllers/application_controller.rb
 - spec/rails2/rails_app/app/helpers/application_helper.rb
+- spec/rails2/rails_app/app/helpers/rails_helpers_spec_helper.rb
+- spec/rails2/rails_app/app/helpers/test_helper.rb
 - spec/rails2/rails_app/app/views/test/_erb.erb
 - spec/rails2/rails_app/app/views/test/_erector.rb
 - spec/rails2/rails_app/app/views/test/_partial_with_locals.rb
@@ -539,31 +587,11 @@ test_files:
 - spec/rails2/rails_app/spec/render_spec.rb
 - spec/rails2/rails_app/test/performance/browsing_test.rb
 - spec/rails2/rails_app/test/test_helper.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/init.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/tasks/rails_xss_tasks.rake
-- spec/rails2/rails_app/vendor/plugins/rails_xss/MIT-LICENSE
-- spec/rails2/rails_app/vendor/plugins/rails_xss/Rakefile
-- spec/rails2/rails_app/vendor/plugins/rails_xss/README.markdown
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/active_record_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/caching_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/date_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/erb_util_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_tag_helper_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/output_safety_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/rails_xss_test.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/test_helper.rb
-- spec/rails2/rails_app/vendor/plugins/rails_xss/test/text_helper_test.rb
 - spec/rails_root/app/controllers/application.rb
 - spec/rails_root/app/controllers/application_controller.rb
 - spec/rails_root/app/helpers/application_helper.rb
 - spec/rails_root/app/views/layouts/application.html.erb
+- spec/rails_root/app/views/layouts/widget_as_layout.rb
 - spec/rails_root/app/views/test/_erb.erb
 - spec/rails_root/app/views/test/_erector.rb
 - spec/rails_root/app/views/test/_partial_with_locals.rb
@@ -577,6 +605,8 @@ test_files:
 - spec/rails_root/app/views/test/protected_instance_variable.html.rb
 - spec/rails_root/app/views/test/render_default.html.rb
 - spec/rails_root/app/views/test/render_partial.html.rb
+- spec/rails_root/app/views/test/render_with_widget_as_layout.rb
+- spec/rails_root/app/views/test/render_with_widget_as_layout_using_content_for.rb
 - spec/rails_root/config/application.rb
 - spec/rails_root/config/boot.rb
 - spec/rails_root/config/database.yml
@@ -595,7 +625,7 @@ test_files:
 - spec/rails_root/db/seeds.rb
 - spec/rails_root/doc/README_FOR_APP
 - spec/rails_root/Gemfile
-- spec/rails_root/log/development.log
+- spec/rails_root/Gemfile.lock
 - spec/rails_root/log/test.log
 - spec/rails_root/public/404.html
 - spec/rails_root/public/422.html
@@ -637,3 +667,4 @@ test_files:
 - spec/rails_root/test/performance/browsing_test.rb
 - spec/rails_root/test/test_helper.rb
 - spec/spec_helper.rb
+- spec/web/article_spec.rb