diff options
Diffstat (limited to 'test/functional/plugin/pack_spec.lua')
| -rw-r--r-- | test/functional/plugin/pack_spec.lua | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/test/functional/plugin/pack_spec.lua b/test/functional/plugin/pack_spec.lua index 5d416ea8e8..1b97921273 100644 --- a/test/functional/plugin/pack_spec.lua +++ b/test/functional/plugin/pack_spec.lua @@ -225,8 +225,8 @@ function repos_setup.semver() add_tag('v0.3.0') repo_write_file('semver', 'lua/semver.lua', 'return "semver middle-commit') git_add_commit('Add middle commit', 'semver') - add_tag('0.3.1') - add_tag('v0.4') + add_tag('0.3.1') -- Semver even without `v` prefix + add_tag('v0.4') -- Not semver since it requires all three version numbers add_tag('non-semver') add_tag('v0.2.1') -- Intentionally add version not in order add_tag('v1.0.0') @@ -946,7 +946,7 @@ describe('vim.pack', function() eq('basic some-tag', exec_lua('return require("basic")')) eq('defbranch main', exec_lua('return require("defbranch")')) - eq('semver v0.4', exec_lua('return require("semver")')) + eq('semver 0.3.1', exec_lua('return require("semver")')) end) it('respects plugin/ and after/plugin/ scripts', function() @@ -1063,7 +1063,7 @@ describe('vim.pack', function() 'Available:\nTags: some%-tag\nBranches: main, feat%-branch', -- Should report available branches and versions if no constraint match '`semver`', - 'Available:\nVersions: v1%.0%.0, v0%.4, 0%.3%.1, v0%.3%.0.*\nBranches: main\n', + 'Available:\nVersions: v1%.0%.0, 0%.3%.1, v0%.3%.0.*\nBranches: main\n', '`pluginerr`:\n', 'Wow, an error', } @@ -1260,7 +1260,7 @@ describe('vim.pack', function() -- This requires computing target hashes on each test run because they -- change due to source repos being cleanly created on each file test. local screen - screen = Screen.new(85, 35) + screen = Screen.new(85, 34) hashes.fetch_new = git_get_hash('main', 'fetch') short_hashes.fetch_new = git_get_short_hash('main', 'fetch') @@ -1301,7 +1301,6 @@ describe('vim.pack', function() | Available newer versions: | • {102:v1.0.0} | - • {102:v0.4} | • {102:0.3.1} | {1:~ }| | @@ -1453,8 +1452,8 @@ describe('vim.pack', function() { lnum = 3, col = 1, end_lnum = 9, end_col = 1, text = '[Module] defbranch' }, { lnum = 9, col = 1, end_lnum = 22, end_col = 1, text = '[Namespace] Update' }, { lnum = 11, col = 1, end_lnum = 22, end_col = 1, text = '[Module] fetch' }, - { lnum = 22, col = 1, end_lnum = 32, end_col = 1, text = '[Namespace] Same' }, - { lnum = 24, col = 1, end_lnum = 32, end_col = 1, text = '[Module] semver (not active)' }, + { lnum = 22, col = 1, end_lnum = 31, end_col = 1, text = '[Namespace] Same' }, + { lnum = 24, col = 1, end_lnum = 31, end_col = 1, text = '[Module] semver (not active)' }, } eq(ref_loclist, loclist) @@ -1497,8 +1496,7 @@ describe('vim.pack', function() assert_hover({ 20, 0 }, 'Commit to be added 1') assert_hover({ 27, 0 }, 'Add version v0.3.0') assert_hover({ 30, 0 }, 'Add version v1.0.0') - assert_hover({ 31, 0 }, 'Add version v0.4') - assert_hover({ 32, 0 }, 'Add version 0.3.1') + assert_hover({ 31, 0 }, 'Add version 0.3.1') -- textDocument/codeAction n.exec_lua(function() @@ -1560,7 +1558,7 @@ describe('vim.pack', function() -- - Only deletion should be available for not active plugins assert_action({ 24, 0 }, { 'Delete `semver`' }, 0) assert_action({ 28, 0 }, { 'Delete `semver`' }, 0) - assert_action({ 32, 0 }, { 'Delete `semver`' }, 0) + assert_action({ 31, 0 }, { 'Delete `semver`' }, 0) -- - Should correctly perform action and remove plugin's lines local function line_match(lnum, pattern) @@ -1633,7 +1631,7 @@ describe('vim.pack', function() -- - Should not wrap around the edge assert(']]', { 24, 0 }) - api.nvim_win_set_cursor(0, { 32, 1 }) + api.nvim_win_set_cursor(0, { 31, 1 }) assert('[[', { 24, 0 }) assert('[[', { 11, 0 }) assert('[[', { 3, 0 }) @@ -1652,7 +1650,7 @@ describe('vim.pack', function() -- Should correctly infer that 0.3.0 is the latest version and suggest -- versions greater than that local confirm_text = table.concat(api.nvim_buf_get_lines(0, 0, -1, false), '\n') - matches('Available newer versions:\n• v1%.0%.0\n• v0%.4\n• 0%.3%.1$', confirm_text) + matches('Available newer versions:\n• v1%.0%.0\n• 0%.3%.1$', confirm_text) end) it('updates lockfile', function() |