Merge pull request #1752 from NeogitOrg/specs-for-general

Author: CKolkey

lefthook.yml

@@ -1,8 +1,6 @@
 skip_output:
   - meta
 pre-push:
-  only:
-    - ref: master
   files: "rg --files"
   parallel: true
   commands:
@@ -19,7 +17,7 @@ pre-push:
       run: typos {files}
     lua-types:
       glob: "*.lua"
-      run: llscheck lua/
+      run: llscheck lua/ || echo {files}
     lua-test:
       glob: "tests/specs/**/*_spec.lua"
       run: nvim --headless -S "./tests/init.lua" || echo {files}
@@ -29,4 +27,23 @@ pre-push:
         - GIT_CONFIG_SYSTEM: /dev/null
         - NVIM_APPNAME: neogit-test
     rspec:
+      only:
+      - ref: master
       run: bin/specs {files}
+pre-commit:
+  parallel: true
+  commands:
+    rubocop:
+      glob: "*.rb"
+      run: bundle exec rubocop {staged_files}
+    selene:
+      glob: "{lua,plugin}/**/*.lua"
+      run: selene --config selene/config.toml {staged_files}
+    stylua:
+      glob: "*.lua"
+      run: stylua --check {staged_files}
+    typos:
+      run: typos {staged_files}
+    lua-types:
+      glob: "*.lua"
+      run: llscheck lua/

lua/neogit/popups/branch/actions.lua

@@ -225,7 +225,7 @@ function M.configure_branch()
     return
   end
 
-  BranchConfigPopup.create(branch_name)
+  BranchConfigPopup.create { branch = branch_name }
 end
 
 function M.rename_branch()

lua/neogit/popups/branch_config/init.lua

@@ -3,9 +3,16 @@ local M = {}
 local popup = require("neogit.lib.popup")
 local git = require("neogit.lib.git")
 local actions = require("neogit.popups.branch_config.actions")
+local notification = require("neogit.lib.notification")
 
-function M.create(branch)
-  branch = branch or git.branch.current()
+---@param env table
+function M.create(env)
+  local branch = env.branch or git.branch.current()
+
+  if not branch then
+    notification.error("Cannot infer branch.")
+    return
+  end
 
   local g_pull_rebase = git.config.get_global("pull.rebase")
   local pull_rebase_entry = git.config.get_local("pull.rebase")

lua/neogit/popups/diff/init.lua

@@ -6,13 +6,13 @@ local actions = require("neogit.popups.diff.actions")
 
 function M.create(env)
   local diffview = config.check_integration("diffview")
-  local commit_selected = env.section.name == "log" and type(env.item.name) == "string"
+  local commit_selected = (env.section and env.section.name == "log") and type(env.item.name) == "string"
 
   local p = popup
     .builder()
     :name("NeogitDiffPopup")
     :group_heading("Diff")
-    :action_if(diffview, "d", "this", actions.this)
+    :action_if(diffview and env.item, "d", "this", actions.this)
     :action_if(diffview and commit_selected, "h", "this..HEAD", actions.this_to_HEAD)
     :action_if(diffview, "r", "range", actions.range)
     :action("p", "paths")

lua/neogit/popups/fetch/actions.lua

@@ -125,7 +125,7 @@ function M.fetch_submodules(_)
 end
 
 function M.set_variables()
-  require("neogit.popups.branch_config").create()
+  require("neogit.popups.branch_config").create {}
 end
 
 return M

lua/neogit/popups/pull/actions.lua

@@ -86,7 +86,7 @@ function M.from_elsewhere(popup)
 end
 
 function M.configure()
-  require("neogit.popups.branch_config").create()
+  require("neogit.popups.branch_config").create {}
 end
 
 return M

lua/neogit/popups/push/actions.lua

@@ -195,7 +195,7 @@ function M.explicit_refspec(popup)
 end
 
 function M.configure()
-  require("neogit.popups.branch_config").create()
+  require("neogit.popups.branch_config").create {}
 end
 
 return M

lua/neogit/popups/remote/actions.lua

@@ -114,7 +114,7 @@ function M.configure(_)
     return
   end
 
-  RemoteConfigPopup.create(remote_name)
+  RemoteConfigPopup.create { remote = remote_name }
 end
 
 function M.prune_branches(_)

lua/neogit/popups/remote_config/init.lua

@@ -1,7 +1,29 @@
 local M = {}
 local popup = require("neogit.lib.popup")
+local notification = require("neogit.lib.notification")
+local git = require("neogit.lib.git")
+
+---@param env table
+function M.create(env)
+  local remotes = git.remote.list()
+  if vim.tbl_isempty(remotes) then
+    notification.warn("Repo has no configured remotes.")
+    return
+  end
+
+  local remote = env.remote
+
+  if not remote then
+    if vim.tbl_contains(remotes, "origin") then
+      remote = "origin"
+    elseif #remotes == 1 then
+      remote = remotes[1]
+    else
+      notification.error("Cannot infer remote.")
+      return
+    end
+  end
 
-function M.create(remote)
   local p = popup
     .builder()
     :name("NeogitRemoteConfigPopup")

spec/general_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe "general things", :git, :nvim do
+  popups = %w[
+    bisect branch branch_config cherry_pick commit
+    diff fetch help ignore log merge pull push rebase
+    remote remote_config reset revert stash tag worktree
+  ]
+
+  popups.each do |popup|
+    it "can invoke #{popup} popup without status buffer", :with_remote_origin do
+      nvim.keys("q")
+      nvim.lua("require('neogit').open({ '#{popup}' })")
+      sleep(0.1) # Allow popup to open
+
+      expect(nvim.filetype).to eq("NeogitPopup")
+      expect(nvim.errors).to be_empty
+    end
+  end
+end