wip

Simon Coffey · Simon Coffey · commit 4df9ace2a96c · 2023-02-06T20:48:53.000Z
diff --git a/tests/units/test_branch.rb b/tests/units/test_branch.rb
@@ -57,46 +57,45 @@ def test_branch_commit
   end
 
   def test_branch_create_and_switch
-    Dir.chdir(@wdir) do
-      assert(!@git.branch('new_branch').current)
-      @git.branch('other_branch').create
-      assert(!@git.branch('other_branch').current)
-      @git.branch('new_branch').checkout
-      assert(@git.branch('new_branch').current)
+    in_bare_repo_clone do |git|
+      assert(!git.branch('new_branch').current)
+      git.branch('other_branch').create
+      assert(!git.branch('other_branch').current)
+      git.branch('new_branch').checkout
+      assert(git.branch('new_branch').current)
 
-      assert_equal(1, @git.branches.select { |b| b.name == 'new_branch' }.size)
+      assert_equal(1, git.branches.select { |b| b.name == 'new_branch' }.size)
 
       new_file('test-file1', 'blahblahblah1')
       new_file('test-file2', 'blahblahblah2')
       new_file('.test-dot-file1', 'blahblahblahdot1')
-      assert(@git.status.untracked.assoc('test-file1'))
-      assert(@git.status.untracked.assoc('.test-dot-file1'))
+      assert(git.status.untracked.assoc('test-file1'))
+      assert(git.status.untracked.assoc('.test-dot-file1'))
 
-      @git.add(['test-file1', 'test-file2'])
-      assert(!@git.status.untracked.assoc('test-file1'))
+      git.add(['test-file1', 'test-file2'])
+      assert(!git.status.untracked.assoc('test-file1'))
 
-      @git.reset
-      assert(@git.status.untracked.assoc('test-file1'))
-      assert(!@git.status.added.assoc('test-file1'))
+      git.reset
+      assert(git.status.untracked.assoc('test-file1'))
+      assert(!git.status.added.assoc('test-file1'))
 
       assert_raise Git::GitExecuteError do
-        @git.branch('new_branch').delete
+        git.branch('new_branch').delete
       end
-      assert_equal(1, @git.branches.select { |b| b.name == 'new_branch' }.size)
+      assert_equal(1, git.branches.select { |b| b.name == 'new_branch' }.size)
 
-      @git.branch('master').checkout
-      @git.branch('new_branch').delete
-      assert_equal(0, @git.branches.select { |b| b.name == 'new_branch' }.size)
+      git.branch('master').checkout
+      git.branch('new_branch').delete
+      assert_equal(0, git.branches.select { |b| b.name == 'new_branch' }.size)
 
-      @git.checkout('other_branch')
-      assert(@git.branch('other_branch').current)
+      git.checkout('other_branch')
+      assert(git.branch('other_branch').current)
 
-      @git.checkout('master')
-      assert(!@git.branch('other_branch').current)
-
-      @git.checkout(@git.branch('other_branch'))
-      assert(@git.branch('other_branch').current)
+      git.checkout('master')
+      assert(!git.branch('other_branch').current)
 
+      git.checkout(@git.branch('other_branch'))
+      assert(git.branch('other_branch').current)
     end
   end
 end
