Fix tests for the new .md default extension.

Author: parkr

lib/jekyll-compose.rb

@@ -2,6 +2,8 @@
 
 module Jekyll
   module Compose
+    DEFAULT_TYPE = "md"
+    DEFAULT_LAYOUT = "post"
   end
 end
 

lib/jekyll/commands/draft.rb

@@ -19,13 +19,8 @@ def self.init_with_program(prog)
       def self.process(args = [], options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
 
-<<<<<<< HEAD
-        type = options["type"] || "md"
-        layout = options["layout"] || "post"
-=======
-        type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"]
-        layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"]
->>>>>>> move type and layout values to contants
+        type = options["type"] || Jekyll::Compose::DEFAULT_TYPE
+        layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
 
         title = args.shift
         name = title.gsub(' ', '-').downcase

lib/jekyll/commands/post.rb

@@ -20,8 +20,8 @@ def self.init_with_program(prog)
       def self.process(args = [], options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
 
-        type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"]
-        layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"]
+        type = options["type"] || Jekyll::Compose::DEFAULT_TYPE
+        layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
 
         date = options["date"].nil? ? Time.now : DateTime.parse(options["date"])
 

lib/jekyll/compose.rb

@@ -2,7 +2,7 @@
   let(:name) { 'A test post' }
   let(:args) { [name] }
   let(:drafts_dir) { Pathname.new source_dir('_drafts') }
-  let(:path) { drafts_dir.join('a-test-post.markdown') }
+  let(:path) { drafts_dir.join('a-test-post.md') }
 
   before(:all) do
     FileUtils.mkdir_p source_dir unless File.directory? source_dir
@@ -25,7 +25,7 @@
 
   it 'writes a helpful success message' do
     output = capture_stdout { described_class.process(args) }
-    expect(output).to eql("New draft created at ./_drafts/a-test-post.markdown.\n")
+    expect(output).to eql("New draft created at ./_drafts/a-test-post.md.\n")
   end
 
   it 'errors with no arguments' do
@@ -36,7 +36,7 @@
 
   context 'when the draft already exists' do
     let(:name) { 'An existing draft' }
-    let(:path) { drafts_dir.join('an-existing-draft.markdown') }
+    let(:path) { drafts_dir.join('an-existing-draft.md') }
 
     before(:each) do
       FileUtils.touch path
@@ -45,7 +45,7 @@
     it 'raises an error' do
       expect(-> {
         capture_stdout { described_class.process(args) }
-      }).to raise_error("A draft already exists at ./_drafts/an-existing-draft.markdown")
+      }).to raise_error("A draft already exists at ./_drafts/an-existing-draft.md")
     end
 
     it 'overwrites if --force is given' do

spec/draft_spec.rb

@@ -2,7 +2,7 @@
   let(:name) { 'A test post' }
   let(:args) { [name] }
   let(:posts_dir) { Pathname.new source_dir('_posts') }
-  let(:filename) { "#{Time.now.strftime('%Y-%m-%d')}-a-test-post.markdown" }
+  let(:filename) { "#{Time.now.strftime('%Y-%m-%d')}-a-test-post.md" }
   let(:path) { posts_dir.join(filename) }
 
   before(:all) do
@@ -37,7 +37,7 @@
 
   context 'when the post already exists' do
     let(:name) { 'An existing post' }
-    let(:filename) { "#{Time.now.strftime('%Y-%m-%d')}-an-existing-post.markdown" }
+    let(:filename) { "#{Time.now.strftime('%Y-%m-%d')}-an-existing-post.md" }
 
     before(:each) do
       FileUtils.touch path