test/helpers/test_capturing.rb in nanoc-4.0.0a2 vs test/helpers/test_capturing.rb in nanoc-4.0.0b1

@@ -15,13 +15,15 @@
     content = "head <% content_for :sidebar do %>\n" \
               "  <%= 1+2 %>\n" \
               '<% end %> foot'
 
     # Build site
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('moo', {}, '/blah/')
-    @item.site = @site
+    site = Nanoc::Int::Site.new({})
+    item = Nanoc::Int::Item.new('moo', {}, '/blah/')
+    item.site = site
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(item)
 
     # Evaluate content
     result = ::ERB.new(content).result(binding)
 
     # Check
@@ -31,12 +33,12 @@
 
   def test_capture
     require 'erb'
 
     # Build site
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('moo', {}, '/blah/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'))
 
     # Capture
     _erbout = 'foo'
     captured_content = capture do
       _erbout << 'bar'
@@ -65,12 +67,12 @@
 <% end %>
 <%= content_for @item, :box %>
 foot
 EOS
 
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('content', {}, '/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
 
     result = ::ERB.new(content).result(binding)
 
     expected = %w( head before basic after foot )
     actual   = result.scan(/[a-z]+/)
@@ -83,19 +85,19 @@
     File.open('Rules', 'w') do |io|
       io.write "compile '*' do ; filter :erb ; end\n"
       io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
     end
 
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('content', {}, '/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
     content = '<% content_for :a do %>Content One<% end %>'
     ::ERB.new(content).result(binding)
 
     assert_equal 'Content One', content_for(@item, :a)
     assert_equal nil,           content_for(@item, :b)
 
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('content', {}, '/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
     content = '<% content_for :b do %>Content Two<% end %>'
     ::ERB.new(content).result(binding)
 
     assert_equal nil,           content_for(@item, :a)
     assert_equal 'Content Two', content_for(@item, :b)