git-topic 0.1.6.4 → 0.2.1

data/spec/git_topic_accept_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+  
+  describe "#accept" do
+
+    describe "while on a review branch" do
+      before( :each ) do
+        use_repo 'in-progress'
+        GitTopic.review 'user24601/zombie-basic'
+      end
+      after( :each ) { Dir.chdir '..' }
+
+      describe "with no specified argument" do
+        it "
+          should merge to master, push master and destroy the local and remote
+          branches when the merge is a fast-forward merge
+        ".oneline do
+
+          git_branch.should               == 'review/user24601/zombie-basic'
+          GitTopic.accept
+          git_branch.should               == 'master'
+          git_branches.should_not         include( 'review/user24601/zombie-basic' )
+          git_remote_branches.should_not  include( 'review/user24601/zombie-basic' )
+
+          git_head.should                 == '0ce06c616769768f09f5e629cfcc68eabe3dee81'
+          git_origin_master.should        == '0ce06c616769768f09f5e629cfcc68eabe3dee81'
+        end
+
+        it "should provide feedback to the user" do
+          GitTopic.accept
+          $?.success?.should          == true
+          @output.should_not          be_nil
+          @output.should_not          be_empty
+        end
+
+        it "should fail if the working tree is dirty" do
+          dirty_branch!
+          lambda{ GitTopic.accept }.should    raise_error
+        end
+      end
+    end
+
+    describe "while on a review branch that does not FF" do
+      before( :each ) do
+        use_repo 'in-progress'
+        system "
+          git checkout master > /dev/null 2> /dev/null && 
+          git merge origin/wip/prevent-ff > /dev/null 2> /dev/null
+        "
+        @original_git_Head    = git_head
+        GitTopic.review 'user24601/zombie-basic'
+      end
+      after( :each ) { Dir.chdir '..' }
+
+      it "should refuse to accept the review branch" do
+        git_branch.should                 == 'review/user24601/zombie-basic'
+        lambda{ GitTopic.accept }.should  raise_error
+        git_branch.should                 == 'review/user24601/zombie-basic'
+        git_remote_branches.should        include( 'review/user24601/zombie-basic' )
+
+        system "git checkout master > /dev/null 2> /dev/null"
+        git_head.should                   == @original_git_Head
+      end
+    end
+
+    describe "while not on a review branch" do
+      before( :each ) { use_repo 'in-progress' }
+      after( :each ) { Dir.chdir '..' }
+
+      it "should fail" do
+        lambda{ GitTopic.accept }.should    raise_error
+      end
+    end
+  end
+
+end

data/spec/git_topic_comment_spec.rb

@@ -0,0 +1,393 @@
+require 'spec_helper'
+
+GeneralCommentOnly = %Q{
+Spec 123:           I have some general comments, mostly relating to the quality
+                    of our zombie-control policies.  Basically, they're not
+                    working.
+}.strip
+
+FirstComment = %Q{
+Spec 123:           I have some general comments, mostly relating to the quality
+                    of our zombie-control policies.  Basically, they're not
+                    working.
+
+./zombies
+
+  Line 2
+    Spec 123:       I suggest we do the following instead:
+                        zombies.each{ |z| reason_with( z )}
+                        zomies.select do |z|
+                          z.unconvinced?
+                        end.each do |z|
+                          destroy z
+                        end
+                    This should take care of our issues with zombies.
+}.strip
+
+FirstCommentUpdated = %Q{
+Spec 123:           I agree, though I wonder if maybe we've become a little too
+                    obsessed with bacon. Umm, wait, sorry, wrong thread.
+                                There is no way this is going to work.  Sorry, but there's just not.
+
+./ninjas
+
+  Line 2
+    Spec 123:       I suggest we do the following instead:
+                      everyone.giveup
+                    This should take care of our issues with zombies.
+}.strip
+
+FirstCommentReply = %Q{
+# Spec 123:         I have some general comments, mostly relating to the quality
+#                   of our zombie-control policies.  Basically, they're not
+#                   working.
+
+I agree, though I wonder if maybe we've become a little too obsessed with bacon. Umm, wait, sorry, wrong thread.
+
+#
+# ./zombies
+#
+#   Line 2
+#     Spec 123:     I suggest we do the following instead:
+#                       zombies.each{ |z| reason_with( z )}
+#                       zomies.select do |z|
+#                         z.unconvinced?
+#                       end.each do |z|
+#                         destroy z
+#                       end
+#                   This should take care of our issues with zombies.
+            There is no way this is going to work.  Sorry, but there's just not.
+}.strip
+
+SecondComment = %Q{
+Spec 123:           I have some general comments, mostly relating to the quality
+                    of our zombie-control policies.  Basically, they're not
+                    working.
+Spec 123:           I agree, though I wonder if maybe we've become a little too
+                    obsessed with bacon. Umm, wait, sorry, wrong thread.
+
+./zombies
+
+  Line 2
+    Spec 123:       I suggest we do the following instead:
+                        zombies.each{ |z| reason_with( z )}
+                        zomies.select do |z|
+                          z.unconvinced?
+                        end.each do |z|
+                          destroy z
+                        end
+                    This should take care of our issues with zombies.
+    Spec 123:       There is no way this is going to work.  Sorry, but there's
+                    just not.
+}.strip
+
+SecondCommentWithReply = %Q{
+Spec 123:           I have some general comments, mostly relating to the quality
+                    of our zombie-control policies.  Basically, they're not
+                    working.
+Spec 234:           I agree, though I wonder if maybe we've become a little too
+                    obsessed with bacon. Umm, wait, sorry, wrong thread.
+
+./zombies
+
+  Line 2
+    Spec 123:       I suggest we do the following instead:
+                        zombies.each{ |z| reason_with( z )}
+                        zomies.select do |z|
+                          z.unconvinced?
+                        end.each do |z|
+                          destroy z
+                        end
+                    This should take care of our issues with zombies.
+    Spec 234:       There is no way this is going to work.  Sorry, but there's
+                    just not.
+}.strip
+
+
+describe GitTopic do
+
+  describe "#comment" do
+
+    before( :each ) do
+      GitTopic.stub!( :invoke_git_editor ) do |path|
+        File.open( path, 'w' ) do |f|
+          f.puts %Q{
+            I have some general comments, mostly relating to the quality of our
+            zombie-control policies.  Basically, they're not working.
+          }.cleanup
+        end
+      end
+    end
+
+    describe "on a review branch with no comments" do
+
+      before( :each ) do
+        use_repo 'in-progress' 
+        GitTopic.review 'user24601/zombie-basic'
+      end
+      after( :each )  { Dir.chdir '..' }
+
+
+      it "should fail if the diff includes added lines not prefixed with #" do
+        File.open( 'zombies', 'a' ){ |f| f.puts "a line" }
+        lambda{ GitTopic.comment }.should     raise_error
+      end
+
+      it "should fail if the diff includes removed lines" do
+        File.open( 'zombies', 'w' ){ |f| f.puts '' }
+        lambda{ GitTopic.comment }.should     raise_error
+      end
+
+      it "should fail if there are new files." do
+        File.open( 'new-untracked-file', 'w' ){ |f| f.puts 'content' }
+        system "git add new-untracked-file > /dev/null 2> /dev/null"
+        lambda{ GitTopic.comment }.should     raise_error
+      end
+
+      it "should fail if files have been deleted." do
+        FileUtils.rm 'zombies'
+        lambda{ GitTopic.comment }.should     raise_error
+      end
+
+      it "should fail if file modes have been modified." do
+        FileUtils.chmod 0744, 'zombies'
+        lambda{ GitTopic.comment }.should     raise_error
+      end
+
+      it "should fail if git config user.name is not set" do
+        GitTopic::Git::ClassMethods.class_variable_set( "@@git_author_name_short", nil )
+        GitTopic.stub( :` ) do |cmd|
+          if cmd =~ %r{^git config user.name}
+            $?.instance_eval do
+              def success?; false; end
+            end
+            ""
+          else
+            %x{#{cmd}}
+          end
+        end
+
+        File.open( 'zombies', 'a' ) do |f|
+          f.puts %Q{
+            # I suggest we do the following instead:
+            #     zombies.each{ |z| reason_with( z )}
+            #     zomies.select do |z|
+            #       z.unconvinced?
+            #     end.each do |z|
+            #       destroy z
+            #     end
+            # This should take care of our issues with zombies.
+          }.cleanup
+        end
+        lambda{ GitTopic.comment }.should     raise_error
+      end
+
+      it "should allow general comments if there is no diff" do
+        git_diff.should                                 be_empty
+
+        GitTopic.should_receive( :invoke_git_editor ).once
+        GitTopic.should_receive(
+          :git_author_name_short
+        ).once.and_return( "Spec 123" )
+
+        lambda{ GitTopic.comment }.should_not           raise_error
+
+        git_notes_list(
+          "refs/notes/reviews/user24601/zombie-basic"
+        ).should_not                                    be_empty
+
+        git_notes_show(
+          "refs/notes/reviews/user24601/zombie-basic"
+        ).should                                        == GeneralCommentOnly
+      end
+
+      it "
+        should convert added lines to notes, formatted appropriately, and save
+        them in refs/notes/reviews/<user>/<topic>.
+      ".oneline do
+        File.open( 'zombies', 'a' ) do |f|
+          f.puts %Q{
+            # I suggest we do the following instead:
+            #     zombies.each{ |z| reason_with( z )}
+            #     zomies.select do |z|
+            #       z.unconvinced?
+            #     end.each do |z|
+            #       destroy z
+            #     end
+            # This should take care of our issues with zombies.
+          }.cleanup
+        end
+        GitTopic.should_receive( :invoke_git_editor ).once
+        GitTopic.should_receive(
+          :git_author_name_short
+        ).once.and_return( "Spec 123" )
+
+        lambda{ GitTopic.comment }.should_not           raise_error
+        git_notes_list(
+          "refs/notes/reviews/user24601/zombie-basic"
+        ).should_not                                    be_empty
+
+        git_notes_show(
+          "refs/notes/reviews/user24601/zombie-basic"
+        ).should                                        == FirstComment
+
+        git_diff.should                                 be_empty
+      end
+
+    end
+
+
+    describe "on a review branch with existing comments" do
+
+      before( :each ) do
+        use_repo( 'in-progress' )
+        GitTopic.review 'user24601/ninja-basic'
+
+        GitTopic.stub!( :invoke_git_editor ) do |path|
+          File.open( path, 'w' ) do |f|
+            f.write FirstCommentReply
+          end
+        end
+      end
+      after( :each )  { Dir.chdir '..' }
+
+
+      it "should fail if the working tree is dirty" do
+        File.open( 'ninjas', 'a' ) do |f|
+          f.puts %Q{
+            # I suggest we do the following instead:
+            #     zombies.each{ |z| reason_with( z )}
+            #     zomies.select do |z|
+            #       z.unconvinced?
+            #     end.each do |z|
+            #       destroy z
+            #     end
+            # This should take care of our issues with zombies.
+          }.cleanup
+        end
+
+        lambda{ GitTopic.comment }.should             raise_error
+      end
+
+      it "should replace existing comments with --force" do
+        File.open( 'ninjas', 'a' ) do |f|
+          f.puts %Q{
+            # I suggest we do the following instead:
+            #   everyone.giveup
+            # This should take care of our issues with zombies.
+          }.cleanup
+        end
+
+        GitTopic.should_receive( :invoke_git_editor ).once
+        GitTopic.should_receive(
+          :git_author_name_short
+        ).once.and_return( "Spec 123" )
+
+
+        lambda do
+          GitTopic.comment  :force_update => true
+        end.should_not                                  raise_error
+
+        git_notes_list(
+          "refs/notes/reviews/user24601/ninja-basic"
+        ).should_not                                    be_empty
+
+        git_notes_show(
+          "refs/notes/reviews/user24601/ninja-basic"
+        ).should                                        == FirstCommentUpdated
+
+        git_diff.should                                 be_empty
+      end
+
+      it "should append comments (without --force-update)" do
+        git_notes_list(
+          "refs/notes/reviews/user24601/ninja-basic"
+        ).should_not                                    be_empty
+        git_notes_show(
+          "refs/notes/reviews/user24601/ninja-basic"
+        ).should                                        == FirstComment
+
+        GitTopic.should_receive( :invoke_git_editor ).once
+        GitTopic.should_receive(
+          :git_author_name_short
+        ).once.and_return( "Spec 123" )
+
+        lambda{ GitTopic.comment }.should_not           raise_error
+        git_notes_list(
+          "refs/notes/reviews/user24601/ninja-basic"
+        ).should_not                                    be_empty
+
+        git_notes_show(
+          "refs/notes/reviews/user24601/ninja-basic"
+        ).should                                        == SecondComment
+      end
+    end
+
+
+    describe "on a wip branch with no comments" do
+      before( :each ) { use_repo 'in-progress' }
+      after( :each )  { Dir.chdir '..' }
+
+      it "should report that there is nothing to do" do
+        GitTopic.work_on 'pirates-advanced'
+        lambda{ GitTopic.comment }.should_not           raise_error
+
+        git_notes_list(
+          "refs/notes/reviews/#{@user}/pirates-advanced"
+        ).should                                        be_empty
+        @output.should_not                              be_empty
+      end
+    end
+
+
+    describe "on a wip branch with existing comments" do
+      before( :each ) do
+        use_repo              'in-progress'
+        GitTopic.work_on      'rejected/krakens'
+
+        GitTopic.stub!( :invoke_git_editor ) do |path|
+          File.open( path, 'w' ) do |f|
+            f.puts FirstCommentReply
+          end
+        end
+      end
+      after( :each )  { Dir.chdir '..' }
+
+
+      it "should fail if the working tree is dirty" do
+        File.open( 'kraken', 'a' ) do |f|
+          f.puts %Q{
+            # I suggest we do the following instead:
+            #     zombies.each{ |z| reason_with( z )}
+            #     zomies.select do |z|
+            #       z.unconvinced?
+            #     end.each do |z|
+            #       destroy z
+            #     end
+            # This should take care of our issues with zombies.
+          }.cleanup
+        end
+
+        lambda{ GitTopic.comment }.should               raise_error
+      end
+
+      it "should append comments" do
+        GitTopic.should_receive( :invoke_git_editor ).once
+        GitTopic.should_receive(
+          :git_author_name_short
+        ).once.and_return( "Spec 234" )
+
+        lambda{ GitTopic.comment }.should_not           raise_error
+        git_notes_list(
+          "refs/notes/reviews/#{@user}/krakens"
+        ).should_not                                    be_empty
+
+        git_notes_show(
+          "refs/notes/reviews/#{@user}/krakens"
+        ).should                                        == SecondCommentWithReply
+      end
+    end
+
+  end
+end
+