From 93293475dfa59fac5530ddbf32bcec8776f817d1 Mon Sep 17 00:00:00 2001 From: Kristijan Husak Date: Wed, 1 May 2024 13:07:01 +0200 Subject: [PATCH] ci: Fix tests --- .github/workflows/tests.yml | 2 +- .themisrc | 4 ++-- test/test-custom-icons.vim | 2 +- test/test-db-navigation.vim | 4 ++-- test/test-disable-mappings.vim | 2 +- test/test-find-buffer-in-drawer.vim | 2 +- test/test-goto-sibling-and-node.vim | 1 + test/test-initialization-with-dbs-variable.vim | 2 +- test/test-mods.vim | 2 +- test/test-show-help.vim | 4 ++-- test/test-toggle-details.vim | 6 +++--- test/test-toggle-drawer-and-quit.vim | 2 +- tests/minimal_init.vim | 4 ++-- tests/plenary/mods_spec.lua | 2 +- 14 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e80e82d..5374a3c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: neovim: true runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Ubuntu System if: matrix.os == 'ubuntu-latest' run: | diff --git a/.themisrc b/.themisrc index d092483..cec854f 100644 --- a/.themisrc +++ b/.themisrc @@ -16,8 +16,8 @@ let g:db_ui_show_help = 0 function! SetupTestDbs() abort let g:dbs = [ - \ {'name': 'dadbod_ui_test', 'url': 'sqlite:'.fnamemodify('test/dadbod_ui_test.db', ':p') }, - \ {'name': 'dadbod_ui_testing', 'url': 'sqlite:'.fnamemodify('test/dadbod_ui_test.db', ':p') }, + \ {'name': 'dadbod_ui_test', 'url': 'sqlite:./test/dadbod_ui_test.db' }, + \ {'name': 'dadbod_ui_sqlite_db', 'url': 'sqlite:./test/dadbod_ui_test.db' }, \ ] endfunction diff --git a/test/test-custom-icons.vim b/test/test-custom-icons.vim index 7703687..529d114 100644 --- a/test/test-custom-icons.vim +++ b/test/test-custom-icons.vim @@ -15,6 +15,6 @@ function! s:suite.should_use_custom_icons() abort :DBUI call s:expect(getline(1, '$')).to_equal([ \ '[+] dadbod_ui_test', - \ '[+] dadbod_ui_testing', + \ '[+] dadbod_ui_sqlite_db', \ ]) endfunction diff --git a/test/test-db-navigation.vim b/test/test-db-navigation.vim index 6aa5ddb..bd6c5ca 100644 --- a/test/test-db-navigation.vim +++ b/test/test-db-navigation.vim @@ -14,7 +14,7 @@ function! s:suite.should_open_dbui() abort call s:expect(&filetype).to_equal('dbui') call s:expect(getline(1, '$')).to_equal([ \ '▸ dadbod_ui_test', - \ '▸ dadbod_ui_testing', + \ '▸ dadbod_ui_sqlite_db', \ ]) endfunction @@ -25,6 +25,6 @@ function! s:suite.should_open_db_navigation() abort \ ' + New query', \ ' ▸ Saved queries (0)', \ ' ▸ Tables (2)', - \ '▸ dadbod_ui_testing', + \ '▸ dadbod_ui_sqlite_db', \ ]) endfunction diff --git a/test/test-disable-mappings.vim b/test/test-disable-mappings.vim index fb1c18e..f1a529b 100644 --- a/test/test-disable-mappings.vim +++ b/test/test-disable-mappings.vim @@ -20,6 +20,6 @@ function! s:suite.should_not_map_o() abort endtry call s:expect(getline(1, '$')).to_equal([ \ '▸ dadbod_ui_test', - \ '▸ dadbod_ui_testing', + \ '▸ dadbod_ui_sqlite_db', \ ]) endfunction diff --git a/test/test-find-buffer-in-drawer.vim b/test/test-find-buffer-in-drawer.vim index 573c01a..38af811 100644 --- a/test/test-find-buffer-in-drawer.vim +++ b/test/test-find-buffer-in-drawer.vim @@ -42,7 +42,7 @@ function! s:suite.should_find_non_dbui_buffer_in_dbui_drawer() abort :DBUIFindBuffer call s:expect(&filetype).to_equal('sql') call s:expect(b:dbui_db_key_name).to_equal('dadbod_ui_test_g:dbs') - call s:expect(b:db).to_equal(g:dbs[0].url) + call s:expect(b:db).to_equal(db_ui#resolve(g:dbs[0].url)) wincmd p call s:expect(&filetype).to_equal('dbui') call s:expect(getline(5)).to_equal(' '.g:db_ui_icons.buffers.' '.self.filename) diff --git a/test/test-goto-sibling-and-node.vim b/test/test-goto-sibling-and-node.vim index 9175224..587e8d5 100644 --- a/test/test-goto-sibling-and-node.vim +++ b/test/test-goto-sibling-and-node.vim @@ -16,6 +16,7 @@ endfunction function! s:suite.should_jump_to_first_last_sibling() abort :DBUI norm oj + call themis#log(getline(1, '$')) call s:expect(line('.')).to_equal(2) exe "norm \" call s:expect(line('.')).to_equal(4) diff --git a/test/test-initialization-with-dbs-variable.vim b/test/test-initialization-with-dbs-variable.vim index 716026f..5f82287 100644 --- a/test/test-initialization-with-dbs-variable.vim +++ b/test/test-initialization-with-dbs-variable.vim @@ -16,5 +16,5 @@ function! s:suite.should_read_global_dbs_variable() abort call s:expect(&filetype).to_equal('dbui') call s:expect(getline(1)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_gdb_test')) call s:expect(getline(2)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_ui_test')) - call s:expect(getline(3)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_ui_testing')) + call s:expect(getline(3)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_ui_sqlite_db')) endfunction diff --git a/test/test-mods.vim b/test/test-mods.vim index f930929..b7bf949 100644 --- a/test/test-mods.vim +++ b/test/test-mods.vim @@ -16,5 +16,5 @@ function! s:suite.should_open_in_new_tab() abort call s:expect(tabpagenr()).to_equal(2) call s:expect(&filetype).to_equal('dbui') call s:expect(getline(1)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_ui_test')) - call s:expect(getline(2)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_ui_testing')) + call s:expect(getline(2)).to_equal(printf('%s %s', g:db_ui_icons.collapsed.db, 'dadbod_ui_sqlite_db')) endfunction diff --git a/test/test-show-help.vim b/test/test-show-help.vim index 693c9d5..632194b 100644 --- a/test/test-show-help.vim +++ b/test/test-show-help.vim @@ -16,7 +16,7 @@ function! s:suite.should_show_help_text() abort call s:expect(getline(1)).to_equal('" Press ? for help') call s:expect(getline(2)).to_be_empty() call s:expect(getline(3)).to_equal('▸ dadbod_ui_test') - call s:expect(getline(4)).to_equal('▸ dadbod_ui_testing') + call s:expect(getline(4)).to_equal('▸ dadbod_ui_sqlite_db') normal ? call s:expect(getline(3)).to_equal('" o - Open/Toggle selected item') @@ -40,5 +40,5 @@ function! s:suite.should_show_help_text() abort call s:expect(getline(1)).to_equal('" Press ? for help') call s:expect(getline(2)).to_be_empty() call s:expect(getline(3)).to_equal('▸ dadbod_ui_test') - call s:expect(getline(4)).to_equal('▸ dadbod_ui_testing') + call s:expect(getline(4)).to_equal('▸ dadbod_ui_sqlite_db') endfunction diff --git a/test/test-toggle-details.vim b/test/test-toggle-details.vim index 704e967..3d14902 100644 --- a/test/test-toggle-details.vim +++ b/test/test-toggle-details.vim @@ -14,16 +14,16 @@ function! s:suite.should_show_details() abort call s:expect(&filetype).to_equal('dbui') call s:expect(getline(1, '$')).to_equal([ \ '▸ dadbod_ui_test', - \ '▸ dadbod_ui_testing', + \ '▸ dadbod_ui_sqlite_db', \ ]) norm H call s:expect(getline(1, '$')).to_equal([ \ '▸ dadbod_ui_test (sqlite - g:dbs)', - \ '▸ dadbod_ui_testing (sqlite - g:dbs)', + \ '▸ dadbod_ui_sqlite_db (sqlite - g:dbs)', \ ]) norm H call s:expect(getline(1, '$')).to_equal([ \ '▸ dadbod_ui_test', - \ '▸ dadbod_ui_testing', + \ '▸ dadbod_ui_sqlite_db', \ ]) endfunction diff --git a/test/test-toggle-drawer-and-quit.vim b/test/test-toggle-drawer-and-quit.vim index a9790c5..1dcc5fb 100644 --- a/test/test-toggle-drawer-and-quit.vim +++ b/test/test-toggle-drawer-and-quit.vim @@ -14,7 +14,7 @@ function! s:suite.should_toggle_drawer() abort call s:expect(&filetype).to_equal('dbui') call s:expect(getline(1, '$')).to_equal([ \ '▸ dadbod_ui_test', - \ '▸ dadbod_ui_testing', + \ '▸ dadbod_ui_sqlite_db', \ ]) :DBUIToggle call s:expect(bufwinnr('dbui')).to_equal(-1) diff --git a/tests/minimal_init.vim b/tests/minimal_init.vim index dd98ea2..1a5b24a 100644 --- a/tests/minimal_init.vim +++ b/tests/minimal_init.vim @@ -24,8 +24,8 @@ let g:db_ui_show_help = 0 function! SetupTestDbs() abort let g:dbs = [ - \ {'name': 'dadbod_ui_test', 'url': 'sqlite:'.fnamemodify('tests/dadbod_ui_test.db', ':p') }, - \ {'name': 'dadbod_ui_testing', 'url': 'sqlite:'.fnamemodify('tests/dadbod_ui_test.db', ':p') }, + \ {'name': 'dadbod_ui_test', 'url': 'sqlite:./tests/dadbod_ui_test.db' }, + \ {'name': 'dadbod_ui_sqlite_db', 'url': 'sqlite:./tests/dadbod_ui_test.db' }, \ ] endfunction diff --git a/tests/plenary/mods_spec.lua b/tests/plenary/mods_spec.lua index 54226c6..894d93e 100644 --- a/tests/plenary/mods_spec.lua +++ b/tests/plenary/mods_spec.lua @@ -14,6 +14,6 @@ describe('Test mods', function() assert.are.same(2, vim.fn.tabpagenr()) assert.are.same('dbui', vim.bo.filetype) assert.are.same(string.format('%s %s', vim.g.db_ui_icons.collapsed.db, 'dadbod_ui_test'), vim.fn.getline(1)) - assert.are.same(string.format('%s %s', vim.g.db_ui_icons.collapsed.db, 'dadbod_ui_testing'), vim.fn.getline(2)) + assert.are.same(string.format('%s %s', vim.g.db_ui_icons.collapsed.db, 'dadbod_ui_sqlite_db'), vim.fn.getline(2)) end) end)