chomp index.html from first url

rovrov · Nov 9, 2014 · 088fd18 · 088fd18
1 parent 130eb1e
commit 088fd18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/jekyll-paginate/pagination.rb b/lib/jekyll-paginate/pagination.rb
@@ -62,7 +62,7 @@ def paginate(site, page)
       # Returns the url of the template page
       def self.first_page_url(site)
         if page = Pagination.new.template_page(site)
-          page.url
+          page.url.chomp("index.html")
         else
           nil
         end

diff --git a/spec/pager_spec.rb b/spec/pager_spec.rb
@@ -15,7 +15,7 @@
     let(:site) { build_site }
 
     it "determines the correct pagination path for each page" do
-      expect(described_class.paginate_path(site, 1)).to eql("/index.html")
+      expect(described_class.paginate_path(site, 1)).to eql("/")
       expect(described_class.paginate_path(site, 2)).to eql("/page2")
     end
   end
@@ -24,7 +24,7 @@
     let(:site) { build_site({'paginate_path' => '/blog/page-:num'}) }
 
     it "determines the correct pagination path for each page" do
-      expect(described_class.paginate_path(site, 1)).to eql("/index.html")
+      expect(described_class.paginate_path(site, 1)).to eql("/")
       expect(described_class.paginate_path(site, 2)).to eql("/blog/page-2")
     end
   end
@@ -33,7 +33,7 @@
     let(:site) { build_site({'paginate_path' => '/blog/page/:num'}) }
 
     it "determines the correct pagination path for each page" do
-      expect(described_class.paginate_path(site, 1)).to eql("/index.html")
+      expect(described_class.paginate_path(site, 1)).to eql("/")
       expect(described_class.paginate_path(site, 2)).to eql("/blog/page/2")
     end
   end
@@ -42,7 +42,7 @@
     let(:site) { build_site({'paginate_path' => '/contacts/page:num'}) }
 
     it "determines the correct pagination path for each page" do
-      expect(described_class.paginate_path(site, 1)).to eql("/contacts/index.html")
+      expect(described_class.paginate_path(site, 1)).to eql("/contacts/")
       expect(described_class.paginate_path(site, 2)).to eql("/contacts/page2")
     end
   end
@@ -51,7 +51,7 @@
     let(:site) { build_site({'paginate_path' => '/contacts/page/:num'}) }
 
     it "determines the correct pagination path for each page" do
-      expect(described_class.paginate_path(site, 1)).to eql("/contacts/index.html")
+      expect(described_class.paginate_path(site, 1)).to eql("/contacts/")
       expect(described_class.paginate_path(site, 2)).to eql("/contacts/page/2")
     end
   end