chore: fix tests

Author: tanvirtin

lua/vgit/core/Buffer_spec.lua

@@ -296,7 +296,7 @@ describe('Buffer:', function()
       buffer:set_lines({ 'test line' })
 
       buffer:place_extmark_sign({
-        col = 0,
+        row = 0,
         name = 'GitSignsAdd',
       })
 
@@ -310,7 +310,7 @@ describe('Buffer:', function()
     it('should clear all extmarks from the buffer', function()
       buffer:set_lines({ 'test line' })
 
-      buffer:place_extmark_sign({ col = 0, name = 'GitSignsAdd' })
+      buffer:place_extmark_sign({ row = 0, name = 'GitSignsAdd' })
       local ns_id = buffer._sign_extmark.ns_id
       local before = vim.api.nvim_buf_get_extmarks(buffer.bufnr, ns_id, 0, -1, {})
       assert.is_true(#before > 0)
@@ -326,7 +326,7 @@ describe('Buffer:', function()
     it('should clear sign extmarks from the buffer', function()
       buffer:set_lines({ 'test line' })
 
-      buffer:place_extmark_sign({ col = 0, name = 'GitSignsAdd' })
+      buffer:place_extmark_sign({ row = 0, name = 'GitSignsAdd' })
       local ns_id = buffer._sign_extmark.ns_id
       local before = vim.api.nvim_buf_get_extmarks(buffer.bufnr, ns_id, 0, -1, {})
       assert.is_true(#before > 0)

lua/vgit/features/buffer/Conflicts_spec.lua

@@ -6,13 +6,26 @@ local eq = assert.are.same
 local navigation_up_calls = {}
 local navigation_down_calls = {}
 
+local window_get_cursor_return = { 1, 0 }
+local window_instance = {
+  get_cursor = function()
+    return window_get_cursor_return
+  end,
+}
+
 local navigation_stub = {
   up = function(window, marks)
     navigation_up_calls[#navigation_up_calls + 1] = { window = window, marks = marks }
   end,
   down = function(window, marks)
     navigation_down_calls[#navigation_down_calls + 1] = { window = window, marks = marks }
   end,
+  current_window = function()
+    return window_instance
+  end,
+  get_current_cursor = function()
+    return window_get_cursor_return
+  end,
 }
 
 local git_buffer_store_stub = {
@@ -21,12 +34,6 @@ local git_buffer_store_stub = {
   end,
 }
 
-local window_get_cursor_return = { 1, 0 }
-local window_instance = {
-  get_cursor = function()
-    return window_get_cursor_return
-  end,
-}
 local Window_stub = setmetatable({}, {
   __index = require('vgit.core.Object'),
   __call = function(_, ...)

lua/vgit/features/buffer/Hunks_spec.lua

@@ -33,6 +33,30 @@ local git_buffer_store_stub = {
   for_each = function() end,
 }
 
+local event_stub = require('tests.helpers.mock_event').create()
+
+local window_lnum = 1
+local window_set_lnum_called = false
+local window_set_lnum_value = nil
+local window_instance = {
+  get_cursor = function()
+    return { window_lnum, 0 }
+  end,
+  get_lnum = function()
+    return window_lnum
+  end,
+  set_lnum = function(self, lnum)
+    window_set_lnum_called = true
+    window_set_lnum_value = lnum
+  end,
+}
+local Window_stub = setmetatable({}, {
+  __index = {},
+  __call = function(_, ...)
+    return window_instance
+  end,
+})
+
 local navigation_up_called = false
 local navigation_up_args = {}
 local navigation_down_called = false
@@ -46,6 +70,20 @@ local navigation_stub = {
     navigation_down_called = true
     navigation_down_args = { window = window, hunks = hunks }
   end,
+  current_window = function()
+    return window_instance
+  end,
+  get_current_lnum = function()
+    return window_lnum
+  end,
+  get_current_cursor = function()
+    return { window_lnum, 0 }
+  end,
+  set_current_lnum = function(lnum)
+    window_lnum = lnum
+    window_set_lnum_called = true
+    window_set_lnum_value = lnum
+  end,
 }
 
 local console_error_called = false
@@ -61,30 +99,6 @@ local console_stub = {
   info = function() end,
 }
 
-local event_stub = require('tests.helpers.mock_event').create()
-
-local window_lnum = 1
-local window_set_lnum_called = false
-local window_set_lnum_value = nil
-local window_instance = {
-  get_cursor = function()
-    return { window_lnum, 0 }
-  end,
-  get_lnum = function()
-    return window_lnum
-  end,
-  set_lnum = function(self, lnum)
-    window_set_lnum_called = true
-    window_set_lnum_value = lnum
-  end,
-}
-local Window_stub = setmetatable({}, {
-  __index = {},
-  __call = function(_, ...)
-    return window_instance
-  end,
-})
-
 -- Install stubs BEFORE requiring Hunks
 package.loaded['vgit.core.event'] = event_stub
 package.loaded['vgit.core.Window'] = Window_stub
@@ -145,6 +159,7 @@ local function make_mock_buffer(opts)
   function buffer:is_valid()
     return opts.is_valid ~= false
   end
+  function buffer:save() end
   return buffer
 end
 

lua/vgit/features/screens/BranchView.lua

@@ -3,7 +3,6 @@ local lazy = require('vgit.core.lazy')
 local View = lazy('vgit.ui.View')
 local console = lazy('vgit.core.console')
 local repository = lazy('vgit.git.repository')
-local LayoutSpec = lazy('vgit.ui.layout.LayoutSpec')
 local SearchComponent = lazy('vgit.ui.components.SearchComponent')
 
 local BranchView = View:extend()
@@ -64,6 +63,11 @@ function BranchView:create(data)
   return true
 end
 
+function BranchView:destroy()
+  self._search_component = nil
+  View.destroy(self)
+end
+
 function BranchView:_on_select(value)
   self:destroy()
 

lua/vgit/features/screens/CommitPickerView.lua

@@ -5,7 +5,6 @@ local event = lazy('vgit.core.event')
 local console = lazy('vgit.core.console')
 local repository = lazy('vgit.git.repository')
 local scene_setting = lazy('vgit.settings.scene')
-local LayoutSpec = lazy('vgit.ui.layout.LayoutSpec')
 local display_service = lazy('vgit.ui.display_service')
 local SearchComponent = lazy('vgit.ui.components.SearchComponent')
 

lua/vgit/features/screens/FileDiffView_spec.lua

@@ -158,18 +158,18 @@ describe('FileDiffView:', function()
       setup_view_mocks()
     end)
 
-    describe('_reconcile', function()
+    describe('_refresh_diff', function()
       it('should return false when diff_component is nil', function()
         view._diff_component = nil
-        local result = view:_reconcile()
+        local result = view:_refresh_diff()
         assert.is_false(result)
       end)
 
       it('should return false when diff_component is invalid', function()
         mock_diff.is_valid = function()
           return false
         end
-        local result = view:_reconcile()
+        local result = view:_refresh_diff()
         assert.is_false(result)
       end)
 
@@ -189,7 +189,7 @@ describe('FileDiffView:', function()
           props_set = props
         end
 
-        view:_reconcile()
+        view:_refresh_diff()
 
         assert.is_true(refresh_called)
         assert.is_not_nil(props_set)
@@ -201,7 +201,7 @@ describe('FileDiffView:', function()
         view._refresh_diff_data = function()
           return nil
         end
-        local result = view:_reconcile()
+        local result = view:_refresh_diff()
         assert.is_false(result)
       end)
 
@@ -218,7 +218,7 @@ describe('FileDiffView:', function()
           moved_to = idx
         end
 
-        view:_reconcile({ hunk_index = 3 })
+        view:_refresh_diff({ hunk_index = 3 })
 
         eq(3, moved_to)
       end)
@@ -236,7 +236,7 @@ describe('FileDiffView:', function()
           move_called = true
         end
 
-        view:_reconcile()
+        view:_refresh_diff()
 
         assert.is_false(move_called)
       end)
@@ -250,15 +250,15 @@ describe('FileDiffView:', function()
           }
         end
 
-        local result = view:_reconcile()
+        local result = view:_refresh_diff()
         assert.is_true(result)
       end)
     end)
 
     describe('toggle_view', function()
-      it('should call _reconcile with hunk_index 1', function()
+      it('should call _refresh_diff with hunk_index 1', function()
         local reconcile_opts = nil
-        view._reconcile = function(_, opts)
+        view._refresh_diff = function(_, opts)
           reconcile_opts = opts
           return true
         end
@@ -271,7 +271,7 @@ describe('FileDiffView:', function()
       end)
 
       it('should revert is_staged on failure', function()
-        view._reconcile = function()
+        view._refresh_diff = function()
           return false
         end
         view._opts.is_staged = false
@@ -282,7 +282,7 @@ describe('FileDiffView:', function()
       end)
 
       it('should keep is_staged flipped on success', function()
-        view._reconcile = function()
+        view._refresh_diff = function()
           return true
         end
         view._opts.is_staged = false
@@ -292,9 +292,9 @@ describe('FileDiffView:', function()
         assert.is_true(view._opts.is_staged)
       end)
 
-      it('should not call _reconcile when filename is nil', function()
+      it('should not call _refresh_diff when filename is nil', function()
         local reconcile_called = false
-        view._reconcile = function()
+        view._refresh_diff = function()
           reconcile_called = true
           return true
         end
@@ -307,14 +307,14 @@ describe('FileDiffView:', function()
     end)
 
     describe('reset_current', function()
-      it('should call _reconcile after repo:reset', function()
+      it('should call _refresh_diff after repo:reset', function()
         local reset_called = false
         local reconcile_called = false
 
         mock_repo.reset = function()
           reset_called = true
         end
-        view._reconcile = function()
+        view._refresh_diff = function()
           reconcile_called = true
           return true
         end
@@ -337,7 +337,7 @@ describe('FileDiffView:', function()
         mock_repo.reset = function()
           reset_called = true
         end
-        view._reconcile = function()
+        view._refresh_diff = function()
           reconcile_called = true
           return true
         end
@@ -348,9 +348,9 @@ describe('FileDiffView:', function()
         assert.is_true(reconcile_called)
       end)
 
-      it('should not call _reconcile when is_staged', function()
+      it('should not call _refresh_diff when is_staged', function()
         local reconcile_called = false
-        view._reconcile = function()
+        view._refresh_diff = function()
           reconcile_called = true
           return true
         end

lua/vgit/features/screens/ProjectDiffView.lua

@@ -5,6 +5,7 @@ local utils = lazy('vgit.core.utils')
 local event = lazy('vgit.core.event')
 local keymap = lazy('vgit.core.keymap')
 local console = lazy('vgit.core.console')
+local navigation = lazy('vgit.core.navigation')
 local repository = lazy('vgit.git.repository')
 local scene_setting = lazy('vgit.settings.scene')
 local LayoutSpec = lazy('vgit.ui.layout.LayoutSpec')

lua/vgit/features/screens/StashView.lua

@@ -7,7 +7,6 @@ local console = lazy('vgit.core.console')
 local git_stash = lazy('vgit.git.git_stash')
 local scene_setting = lazy('vgit.settings.scene')
 local LayoutSpec = lazy('vgit.ui.layout.LayoutSpec')
-local statusline = lazy('vgit.core.statusline_state')
 local stash_view_setting = lazy('vgit.settings.stash_view')
 local SearchComponent = lazy('vgit.ui.components.SearchComponent')
 local PatchPreviewComponent = lazy('vgit.ui.components.PatchPreviewComponent')

lua/vgit/features/screens/WorktreeView.lua

@@ -7,7 +7,6 @@ local console = lazy('vgit.core.console')
 local git_repo = lazy('vgit.git.git_repo')
 local repository = lazy('vgit.git.repository')
 local git_worktree = lazy('vgit.git.git_worktree')
-local LayoutSpec = lazy('vgit.ui.layout.LayoutSpec')
 local SearchComponent = lazy('vgit.ui.components.SearchComponent')
 
 local WorktreeView = View:extend()