Merge pull request #319 from ashmaroli/verbose-test-files

Improve spec site fixture

Author: mertkahyaoglu

spec/fixtures/site/_config.yml

@@ -1,8 +1,10 @@
 title: Your awesome title
 
+# Load the admin interface.
 gems:
   - jekyll-admin
 
+# Exclude these files from being processed.
 exclude:
   - Gemfile
   - Gemfile.lock
@@ -17,6 +19,7 @@ defaults:
     values:
       some_front_matter: "default"
 
+# Dummy Collection.
 collections:
   puppies:
     foo: bar

spec/fixtures/site/_data/data_file2.yml

@@ -0,0 +1,39 @@
+# Welcome to Jekyll!
+#
+# This config file is meant for settings that affect your whole blog, values which you are expected to set up once and rarely edit after that. If you find
+# yourself editing this file very often, consider using Jekyll's data files feature for the data you need to update frequently.
+#
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
+
+# Site settings
+# These are used to personalize your new site. If you look in the HTML files, you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
+# You can create any custom variable you would like, and they will be accessible in the templates via {{ site.myvariable }}.
+title: Your awesome title
+email: [email protected]
+description: > # this means to ignore newlines until "baseurl:"
+  Write an awesome description for your new site here. You can edit this
+  line in _config.yml. It will appear in your document head meta (for
+  Google search results) and in your feed.xml site description.
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "" # the base hostname & protocol for your site, e.g. http://example.com
+twitter_username: jekyllrb
+github_username:  jekyll
+
+# Build settings
+markdown: kramdown
+theme: minima
+gems:
+  - jekyll-feed
+  - jekyll-admin
+
+# Exclude from processing.
+# The following items will not be processed, by default. Create a custom list to override the default setting.
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - node_modules
+  - vendor/bundle/
+  - vendor/cache/
+  - vendor/gems/
+  - vendor/ruby/

spec/fixtures/site/_data/template-config.yml

@@ -0,0 +1,6 @@
+---
+title: Post Within Subdirectory
+foo: bar
+---
+
+# Test Post within `_posts/more posts`

spec/fixtures/site/_posts/2016-01-01-test.md spec/fixtures/site/_posts/2016-01-01-test-post.md

@@ -0,0 +1,6 @@
+---
+title: A Test Post Within Subdirectory
+foo: bar
+---
+
+# Test Post within `_posts/more posts/some more posts`

spec/fixtures/site/_posts/2016-02-01-test.md spec/fixtures/site/_posts/2016-02-01-test-post-2.md

@@ -0,0 +1,6 @@
+---
+title: Another Test Post Within Subdirectory
+foo: bar
+---
+
+# Another Test Post within `_posts/more posts/some more posts`

spec/fixtures/site/_posts/2016-03-01-test.md spec/fixtures/site/_posts/2016-03-01-test-post-3.md

@@ -91,14 +91,19 @@ def app
         get "/collections/posts/entries/"
         expect(last_response).to be_ok
         expect(entries.first["type"]).to eq("directory")
-        expect(entries.first["name"]).to eq("test")
+        expect(entries.first["name"]).to eq("more posts")
       end
 
       it "lists documents in subdirectories" do
-        get "/collections/posts/entries/test/other/"
+        get "/collections/posts/entries/more%20posts/some%20more%20posts/"
         expect(last_response).to be_ok
-        expect(first_document["id"]).to eq("/2016/05/02/test")
-        expect(first_document["path"]).to eq("_posts/test/other/2016-05-02-test.md")
+        expect(first_document["id"])
+          .to eq("/2016/05/02/another-test-post-within-subdirectory")
+        expect(first_document["path"])
+          .to eq(
+            "_posts/more posts/some more " \
+            "posts/2016-05-02-another-test-post-within-subdirectory.md"
+          )
       end
     end
   end
@@ -110,21 +115,21 @@ def app
 
   context "getting a single document" do
     it "returns a collection document" do
-      get "/collections/posts/2016-01-01-test.md"
+      get "/collections/posts/2016-01-01-test-post.md"
       expect(last_response).to be_ok
-      expect(last_response_parsed["title"]).to eq("Test")
+      expect(last_response_parsed["title"]).to eq("Test Post")
     end
 
     it "returns a collection document in subdirectories" do
-      get "/collections/posts/test/2016-04-01-test.md"
+      get "/collections/posts/more%20posts/2016-04-01-post-within-subdirectory.md"
       expect(last_response).to be_ok
-      expect(last_response_parsed["title"]).to eq("Test")
+      expect(last_response_parsed["title"]).to eq("Post Within Subdirectory")
     end
 
     it "returns a collection document using the slashed ID" do
-      get "/collections/posts/2016/01/01/test.md"
+      get "/collections/posts/2016-01-01-test-post.md"
       expect(last_response).to be_ok
-      expect(last_response_parsed["title"]).to eq("Test")
+      expect(last_response_parsed["title"]).to eq("Test Post")
     end
 
     it "returns a non-dated document" do
@@ -140,29 +145,29 @@ def app
     end
 
     it "returns the rendered output" do
-      get "/collections/posts/2016-01-01-test.md"
+      get "/collections/posts/2016-01-01-test-post.md"
       expect(last_response).to be_ok
       expected = "<h1 id=\"test-post\">Test Post</h1>\n"
       expect(last_response_parsed["content"]).to eq(expected)
     end
 
     it "returns the raw content" do
-      get "/collections/posts/2016-01-01-test.md"
+      get "/collections/posts/2016-01-01-test-post.md"
       expect(last_response).to be_ok
       expect(last_response_parsed["raw_content"]).to eq("# Test Post\n")
     end
 
     %w(next previous).each do |direction|
       it "includes the #{direction} document non-recursively" do
-        get "/collections/posts/2016-02-01-test.md"
+        get "/collections/posts/2016-02-01-test-post-2.md"
         expect(last_response).to be_ok
         expect(last_response_parsed).to have_key(direction)
         expect(last_response_parsed[direction]).to_not have_key("next")
         expect(last_response_parsed[direction]).to_not have_key("previous")
       end
 
       it "doesn't include the #{direction} document's content" do
-        get "/collections/posts/2016-02-01-test.md"
+        get "/collections/posts/2016-02-01-test-post-2.md"
         expect(last_response).to be_ok
         expect(last_response_parsed).to have_key(direction)
         expect(last_response_parsed[direction]).to_not have_key("content")
@@ -175,18 +180,18 @@ def app
       let(:front_matter) { last_response_parsed["front_matter"] }
 
       it "contains front matter defaults" do
-        get "/collections/posts/2016-01-01-test.md"
+        get "/collections/posts/2016-01-01-test-post.md"
         expect(last_response_parsed.key?("some_front_matter")).to eql(true)
       end
 
       it "contains raw front matter" do
-        get "/collections/posts/2016-01-01-test.md"
+        get "/collections/posts/2016-01-01-test-post.md"
         expect(last_response_parsed.key?("front_matter")).to eql(true)
         expect(front_matter["foo"]).to eql("bar")
       end
 
       it "raw front matter doesn't contain defaults" do
-        get "/collections/posts/2016-01-01-test.md"
+        get "/collections/posts/2016-01-01-test-post.md"
         expect(front_matter.key?("some_front_matter")).to eql(false)
       end
     end
@@ -234,19 +239,19 @@ def app
   end
 
   it "writes a new file in subdirectories" do
-    delete_file "_posts/test/2016-01-01-test2.md"
+    delete_file "_posts/more posts/2016-01-01-test2.md"
 
     request = {
       :front_matter => { :foo => "bar" },
       :raw_content  => "test",
     }
-    put "/collections/posts/test/2016-01-01-test2.md", request.to_json
+    put "/collections/posts/more%20posts/2016-01-01-test2.md", request.to_json
 
     expect(last_response).to be_ok
     expect(last_response_parsed["foo"]).to eq("bar")
-    expect("_posts/test/2016-01-01-test2.md").to be_an_existing_file
+    expect("_posts/more posts/2016-01-01-test2.md").to be_an_existing_file
 
-    delete_file "_posts/test/2016-01-01-test2.md"
+    delete_file "_posts/more posts/2016-01-01-test2.md"
   end
 
   it "updates a file" do
@@ -266,19 +271,19 @@ def app
   end
 
   it "updates a file in subdirectories" do
-    write_file "_posts/test/2016-01-01-test2.md"
+    write_file "_posts/more posts/2016-01-01-test2.md"
 
     request = {
       :front_matter => { :foo => "bar2" },
       :raw_content  => "test",
     }
-    put "/collections/posts/test/2016-01-01-test2.md", request.to_json
+    put "/collections/posts/more%20posts/2016-01-01-test2.md", request.to_json
 
     expect(last_response).to be_ok
     expect(last_response_parsed["foo"]).to eq("bar2")
-    expect("_posts/test/2016-01-01-test2.md").to be_an_existing_file
+    expect("_posts/more posts/2016-01-01-test2.md").to be_an_existing_file
 
-    delete_file "_posts/test/2016-01-01-test2.md"
+    delete_file "_posts/more posts/2016-01-01-test2.md"
   end
 
   it "writes a new file with a future date" do
@@ -326,28 +331,31 @@ def app
     end
 
     it "renames a file in subdirectories" do
-      write_file "_posts/test/2016-01-01-test2.md"
-      delete_file "_posts/test/2016-01-02-test2.md"
+      write_file "_posts/more posts/2016-01-01-test2.md"
+      delete_file "_posts/more posts/2016-01-02-test2.md"
 
-      path = "_posts/test/2016-01-02-test2.md"
+      path = "_posts/more posts/2016-01-02-test2.md"
       request = {
         :path         => path,
         :front_matter => { :foo => "bar2" },
         :raw_content  => "test",
       }
 
-      put "/collections/posts/test/2016-01-01-test2.md", request.to_json
+      put "/collections/posts/more%20posts/2016-01-01-test2.md", request.to_json
       expect(last_response).to be_ok
       expect(last_response_parsed["foo"]).to eq("bar2")
 
-      get "/collections/posts/test/2016-01-02-test2.md", request.to_json
+      get "/collections/posts/more%20posts/2016-01-02-test2.md", request.to_json
       expect(last_response).to be_ok
       expect(last_response_parsed["foo"]).to eq("bar2")
 
-      expect("_posts/test/2016-01-01-test2.md").to_not be_an_existing_file
-      expect("_posts/test/2016-01-02-test2.md").to be_an_existing_file
+      expect("_posts/more posts/2016-01-01-test2.md").to_not be_an_existing_file
+      expect("_posts/more posts/2016-01-02-test2.md").to be_an_existing_file
 
-      delete_file "_posts/test/2016-01-01-test2.md", "_posts/test/2016-01-02-test2.md"
+      delete_file(
+        "_posts/more posts/2016-01-01-test2.md",
+        "_posts/more posts/2016-01-02-test2.md"
+      )
     end
   end
 
@@ -359,10 +367,11 @@ def app
   end
 
   it "deletes a file in subdirectories" do
-    write_file "_posts/test/other/2017-01-01-test.md"
-    delete "/collections/posts/test/other/2017-01-01-test.md"
+    write_file "_posts/more posts/some more posts/2017-01-01-test.md"
+    delete "/collections/posts/more%20posts/some%20more%20posts/2017-01-01-test.md"
     expect(last_response).to be_ok
-    expect("_posts/test/other/2017-01-01-test.md").to_not be_an_existing_file
-    delete_file "_posts/test/other/2017-01-01-test.md"
+    expect("_posts/more posts/some more posts/2017-01-01-test.md")
+      .to_not be_an_existing_file
+    delete_file "_posts/more posts/some more posts/2017-01-01-test.md"
   end
 end

spec/fixtures/site/_posts/more posts/2016-04-01-post-within-subdirectory.md

@@ -34,8 +34,8 @@
 
   context "posts" do
     subject { JekyllAdmin.site.posts.docs.first }
-    let(:http_url) { "#{url_base}/2016/01/01/test.html" }
-    let(:api_url) { "#{url_base}/#{prefix}/collections/posts/2016-01-01-test.md" }
+    let(:http_url) { "#{url_base}/2016/01/01/test-post.html" }
+    let(:api_url) { "#{url_base}/#{prefix}/collections/posts/2016-01-01-test-post.md" }
 
     it "knows the HTTP URL" do
       expect(subject.http_url).to eql(http_url)
@@ -90,8 +90,8 @@
 
   context "static files" do
     subject { JekyllAdmin.site.static_files.first }
-    let(:http_url) { "#{url_base}/index.html" }
-    let(:api_url) { "#{url_base}/#{prefix}/static_files/index.html" }
+    let(:http_url) { "#{url_base}/icon-github.svg" }
+    let(:api_url) { "#{url_base}/#{prefix}/static_files/icon-github.svg" }
 
     it "knows the HTTP URL" do
       expect(subject.http_url).to eql(http_url)