spec/commands/story_commit_spec.rb in pivotal-github-0.7.0 vs spec/commands/story_commit_spec.rb in pivotal-github-0.8.0

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe StoryCommit do
 
-  let(:command) { StoryCommit.new(['-m', 'message', '-a', '-z', '--foo']) }
+  let(:command) { StoryCommit.new(['-m', 'msg', '-a', '-z', '--foo']) }
   before { command.stub(:story_branch).and_return('6283185-tau-manifesto') }
   subject { command }
 
   it { should respond_to(:message) }
 
@@ -17,30 +17,30 @@
     its(:all?)     { should be_true }
 
     describe "parse" do
       subject { command.options }
 
-      its(:message) { should == 'message' }
+      its(:message) { should == 'msg' }
       its(:all)     { should be_true }
     end
   end
 
   describe "with only known options" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-a']) }
+    let(:command) { StoryCommit.new(['-m', 'msg', '-a']) }
     it_should_behave_like "story-commit with known options"
   end
 
   describe "with a compound argument" do
-    let(:command) { StoryCommit.new(['-am', 'message']) }
+    let(:command) { StoryCommit.new(['-am', 'msg']) }
     it_should_behave_like "story-commit with known options"
   end
 
   describe "with some unknown options" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-a', '-z', '--foo']) }
-    
+    let(:command) { StoryCommit.new(['-m', 'msg', '-a', '-z', '--foo']) }
+
     it_should_behave_like "story-commit with known options"
-    
+
     it "should not raise an error" do
       expect { command.parse }.not_to raise_error(OptionParser::InvalidOption)
     end
   end
 
@@ -49,74 +49,76 @@
     it { should == '6283185' }
   end
 
   describe "command with message" do
     its(:cmd) do
-      should == %(git commit -a -m "[##{command.story_id}] message" -z --foo)
+      should == %(git commit -a -m "msg" -m "[##{command.story_id}]" -z --foo)
     end
 
     describe "when used with branches containing multiple stories" do
       before do
         command.stub(:story_branch).and_return('6283185-tau-manifesto-3141592')
       end
       its(:cmd) do
         delivered_ids = '#6283185 #3141592'
-        should == %(git commit -a -m "[#{delivered_ids}] message" -z --foo)
+        should == %(git commit -a -m "msg" -m "[#{delivered_ids}]" -z --foo)
       end
     end
   end
 
   describe "command with no message" do
     let(:command) { StoryCommit.new(['-a', '-z', '--foo']) }
-    its(:cmd) { should == %(git commit -a -z --foo) }      
+    its(:cmd) do
+      should == %(git commit -a -m "[##{command.story_id}]" -z --foo)
+    end
   end
 
   describe "command with finish flag" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-f']) }
+    let(:command) { StoryCommit.new(['-m', 'msg', '-f']) }
     its(:cmd) do
-      should == %(git commit -m "[Finishes ##{command.story_id}] message")
-    end      
+      should == %(git commit -m "msg" -m "[Finishes ##{command.story_id}]")
+    end
 
     describe "when used with branches containing multiple stories" do
       before do
         command.stub(:story_branch).and_return('6283185-tau-manifesto-3141592')
       end
       its(:cmd) do
         delivered_ids = '#6283185 #3141592'
-        should == %(git commit -m "[Finishes #{delivered_ids}] message")
+        should == %(git commit -m "msg" -m "[Finishes #{delivered_ids}]")
       end
     end
   end
 
   describe "command with deliver flag" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-d']) }
+    let(:command) { StoryCommit.new(['-m', 'msg', '-d']) }
     its(:cmd) do
-      should == %(git commit -m "[Delivers ##{command.story_id}] message")
+      should == %(git commit -m "msg" -m "[Delivers ##{command.story_id}]")
     end
 
     describe "when used with branches containing multiple stories" do
       before do
         command.stub(:story_branch).and_return('6283185-tau-manifesto-3141592')
       end
       its(:cmd) do
         delivered_ids = '#6283185 #3141592'
-        should == %(git commit -m "[Delivers #{delivered_ids}] message")
+        should == %(git commit -m "msg" -m "[Delivers #{delivered_ids}]")
       end
     end
   end
 
   describe "command with no story id" do
     before { command.stub(:story_branch).and_return('tau-manifesto') }
     its(:cmd) do
-      should == %(git commit -a -m "message" -z --foo)
-    end    
+      should == %(git commit -a -m "msg" -z --foo)
+    end
   end
 
   describe "command-line command" do
-    let(:command) { `bin/git-story-commit -a -m "message" -z --debug` }
+    let(:command) { `bin/git-story-commit -a -m "msg" -z --debug` }
     subject { command }
     it { should =~ /git commit -a -m/ }
-    it { should =~ /message/ }
+    it { should =~ /msg/ }
     it { should =~ /-z/ }
     it { should_not =~ /--debug/ }
   end
 end
\ No newline at end of file