fix up specs for 3.x

Author: parkr

spec/integrations_spec.rb

@@ -2,12 +2,12 @@
 
 describe("Integration Tests") do
   it "writes the redirect pages for collection items which are outputted" do
-    expect(@dest.join("articles", "redirect-me-plz.html")).to exist
-    expect(@dest.join("articles", "23128432159832", "mary-had-a-little-lamb")).to exist
+    expect(dest_dir("articles", "redirect-me-plz.html")).to exist
+    expect(dest_dir("articles", "23128432159832", "mary-had-a-little-lamb.html")).to exist
   end
 
   it "doesn't write redirect pages for collection items which are not outputted" do
-    expect(@dest.join("authors")).not_to exist
-    expect(@dest.join("kansaichris")).not_to exist
+    expect(dest_dir("authors")).not_to exist
+    expect(dest_dir("kansaichris")).not_to exist
   end
 end

spec/jekyll_redirect_from/redirect_page_spec.rb

@@ -36,14 +36,14 @@
       let(:redirect_page) { new_redirect_page(permalink_dir) }
 
       it "knows to add the index.html if it's a folder" do
-        dest = dest_dir("/posts/1914798137981389/larry-had-a-little-lamb/index.html")
+        dest = dest_dir("posts", "1914798137981389", "larry-had-a-little-lamb", "index.html").to_s
         expect(redirect_page.destination("/")).to eql(dest)
       end
     end
 
     context "of a redirect page meant to be a file" do
       it "knows not to add the index.html if it's not a folder" do
-        dest = dest_dir("/posts/12435151125/larry-had-a-little-lamb")
+        dest = dest_dir("posts", "12435151125", "larry-had-a-little-lamb.html").to_s
         expect(redirect_page.destination("/")).to eql(dest)
       end
     end
@@ -58,7 +58,7 @@
     end
 
     it "fetches the path properly" do
-      expect(redirect_page_full_path).to match /\/spec\/fixtures\/\_site\/posts\/12435151125\/larry-had-a-little-lamb$/
+      expect(redirect_page_full_path).to match /\/spec\/fixtures\/\_site\/posts\/12435151125\/larry-had-a-little-lamb.html$/
     end
 
     it "is written to the proper location" do

spec/jekyll_redirect_from/redirector_spec.rb

@@ -52,33 +52,33 @@
     end
 
     it "generates the refresh page for the post properly" do
-      expect(destination_file_exists?("posts/23128432159832/mary-had-a-little-lamb")).to be_truthy
+      expect(dest_dir("posts/23128432159832/mary-had-a-little-lamb.html")).to exist
     end
 
     it "generates the refresh pages for the page with multiple redirect_from urls" do
-      expect(destination_file_exists?("help")).to be_truthy
-      expect(destination_file_exists?("contact")).to be_truthy
-      expect(destination_file_exists?("let-there/be/light-he-said")).to be_truthy
-      expect(destination_file_exists?("/geepers/mccreepin")).to be_truthy
+      expect(dest_dir("help")).to be_truthy
+      expect(dest_dir("contact")).to be_truthy
+      expect(dest_dir("let-there/be/light-he-said")).to be_truthy
+      expect(dest_dir("/geepers/mccreepin")).to be_truthy
     end
 
     it "generates the refresh page for the page with one redirect_from url" do
-      expect(destination_file_exists?("mencius/was/my/father")).to be_truthy
+      expect(dest_dir("mencius/was/my/father.html")).to exist
     end
 
     it "generates the refresh page for the collection with one redirect_to url" do
-      expect(@dest.join("articles", "redirect-somewhere-else-plz.html")).to exist
-      expect(destination_doc_contents("articles", "redirect-somewhere-else-plz.html")).to include(%|<meta http-equiv="refresh" content="0; url=http://www.zombo.com">|)
+      expect(dest_dir("articles", "redirect-somewhere-else-plz.html")).to exist
+      expect(dest_dir("articles", "redirect-somewhere-else-plz.html").read).to include(%|<meta http-equiv="refresh" content="0; url=http://www.zombo.com">|)
     end
 
     it "generates the refresh page for the page with one redirect_to url" do
-      expect(destination_file_exists?("one_redirect_to.html")).to be_truthy
-      expect(destination_file_contents("one_redirect_to.html")).to include(%|<meta http-equiv="refresh" content="0; url=https://www.github.com">|)
+      expect(dest_dir("one_redirect_to.html")).to exist
+      expect(dest_dir("one_redirect_to.html").read).to include(%|<meta http-equiv="refresh" content="0; url=https://www.github.com">|)
     end
 
     it "generates the refresh page for the page with multiple redirect_to urls" do
-      expect(destination_file_exists?("multiple_redirect_tos.html")).to be_truthy
-      expect(destination_file_contents("multiple_redirect_tos.html")).to include(%|<meta http-equiv="refresh" content="0; url=https://www.jekyllrb.com">|)
+      expect(dest_dir("multiple_redirect_tos.html")).to exist
+      expect(dest_dir("multiple_redirect_tos.html").read).to include(%|<meta http-equiv="refresh" content="0; url=https://www.jekyllrb.com">|)
     end
   end
 

spec/spec_helper.rb

@@ -38,7 +38,7 @@
   end
 
   def dest_dir(*paths)
-    File.join(@dest.to_s, *paths)
+    @dest.join(*paths)
   end
 
   def unpublished_doc
@@ -57,26 +57,15 @@ def setup_page(file)
     Jekyll::Page.new(@site, @fixtures_path.to_s, File.dirname(file), File.basename(file))
   end
 
-  def destination_file_exists?(file)
-    File.exists?(File.join(@dest.to_s, file))
-  end
-
-  def destination_file_contents(file)
-    File.read(File.join(@dest.to_s, file))
-  end
-
-  def destination_doc_contents(collection, file)
-    File.read(File.join(@dest.to_s, collection, file))
-  end
-
   def new_redirect_page(permalink)
-    page = JekyllRedirectFrom::RedirectPage.new(@site, @site.source, "", "")
+    page = JekyllRedirectFrom::RedirectPage.new(@site, @site.source, "", "index.html")
     page.data['permalink'] = permalink
+    page.data['sitemap'] = false
     page
   end
 
   def destination_sitemap
-    File.read(File.join(@dest.to_s, 'sitemap.xml'))
+    @dest.join("sitemap.xml").read
   end
 end