test/helpers/test_xml_sitemap.rb in nanoc-3.7.3 vs test/helpers/test_xml_sitemap.rb in nanoc-3.7.4

- old
+ new

@@ -17,25 +17,25 @@ # Create items @items = [] # Create item 1 @items << Nanoc::Item.new('some content 1', {}, '/item-one/') - self.create_item_rep(@items.last, :one_a, '/item-one/a/') - self.create_item_rep(@items.last, :one_b, '/item-one/b/') + create_item_rep(@items.last, :one_a, '/item-one/a/') + create_item_rep(@items.last, :one_b, '/item-one/b/') # Create item 2 @items << Nanoc::Item.new('some content 2', { :is_hidden => true }, '/item-two/') # Create item 3 attrs = { :mtime => Time.parse('2004-07-12'), :changefreq => 'daily', :priority => 0.5 } @items << Nanoc::Item.new('some content 3', attrs, '/item-three/') - self.create_item_rep(@items.last, :three_a, '/item-three/a/') - self.create_item_rep(@items.last, :three_b, '/item-three/b/') + create_item_rep(@items.last, :three_a, '/item-three/a/') + create_item_rep(@items.last, :three_b, '/item-three/b/') # Create item 4 @items << Nanoc::Item.new('some content 4', {}, '/item-four/') - self.create_item_rep(@items.last, :four_a, nil) + create_item_rep(@items.last, :four_a, nil) # Create sitemap item @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/') # Create site @@ -73,22 +73,22 @@ if_have 'builder', 'nokogiri' do # Create items @items = [] @items << nil @items << Nanoc::Item.new('some content 1', {}, '/item-one/') - self.create_item_rep(@items.last, :one_a, '/item-one/a/') - self.create_item_rep(@items.last, :one_b, '/item-one/b/') + create_item_rep(@items.last, :one_a, '/item-one/a/') + create_item_rep(@items.last, :one_b, '/item-one/b/') @items << nil # Create sitemap item @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/') # Create site @site = Nanoc::Site.new({ :base_url => 'http://example.com' }) # Build sitemap - res = xml_sitemap(:items => [ @items[1] ]) + res = xml_sitemap(:items => [@items[1]]) # Check doc = Nokogiri::XML(res) urlsets = doc.css('> urlset') assert_equal 1, urlsets.size @@ -106,13 +106,13 @@ end def test_filter if_have 'builder', 'nokogiri' do # Create items - @items = [ Nanoc::Item.new('some content 1', {}, '/item-one/') ] - self.create_item_rep(@items.last, :one_a, '/item-one/a/') - self.create_item_rep(@items.last, :one_b, '/item-one/b/') + @items = [Nanoc::Item.new('some content 1', {}, '/item-one/')] + create_item_rep(@items.last, :one_a, '/item-one/a/') + create_item_rep(@items.last, :one_b, '/item-one/b/') # Create sitemap item @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/') # Create site @@ -137,18 +137,18 @@ def test_sorted if_have 'builder', 'nokogiri' do # Create items @items = [] @items << Nanoc::Item.new('some content 1', {}, '/george/') - self.create_item_rep(@items.last, :a_alice, '/george/alice/') - self.create_item_rep(@items.last, :b_zoey, '/george/zoey/') + create_item_rep(@items.last, :a_alice, '/george/alice/') + create_item_rep(@items.last, :b_zoey, '/george/zoey/') @items << Nanoc::Item.new('some content 1', {}, '/walton/') - self.create_item_rep(@items.last, :a_eve, '/walton/eve/') - self.create_item_rep(@items.last, :b_bob, '/walton/bob/') + create_item_rep(@items.last, :a_eve, '/walton/eve/') + create_item_rep(@items.last, :b_bob, '/walton/bob/') @items << Nanoc::Item.new('some content 1', {}, '/lucas/') - self.create_item_rep(@items.last, :a_trudy, '/lucas/trudy/') - self.create_item_rep(@items.last, :b_mallory, '/lucas/mallory/') + create_item_rep(@items.last, :a_trudy, '/lucas/trudy/') + create_item_rep(@items.last, :b_mallory, '/lucas/mallory/') # Create sitemap item @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/') # Create site @@ -170,10 +170,10 @@ assert_equal 'http://example.com/walton/eve/', urls[4].css('> loc').inner_text assert_equal 'http://example.com/walton/bob/', urls[5].css('> loc').inner_text end end -protected + protected def create_item_rep(item, name, path) rep = Nanoc::ItemRep.new(item, name) rep.paths = { :last => path } rep.raw_paths = { :last => path }