ci: Fix tests

.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: |

.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
 

autoload/db_ui.vim

@@ -389,6 +389,7 @@ function! s:dbui.connect(db) abort
   catch /.*/
     let a:db.conn_error = v:exception
     let a:db.conn = ''
+    echom string(v:exception)
     call db_ui#notifications#error('Error connecting to db '.a:db.name.': '.v:exception, {'width': 80 })
   endtry
 

autoload/db_ui/query.vim

@@ -2,6 +2,14 @@ let s:query_instance = {}
 let s:query = {}
 let s:bind_param_rgx = '\(^\|[[:blank:]]\|[^:]\)\('.g:db_ui_bind_param_pattern.'\)'
 
+function! s:query.print_query_time() abort
+  if empty(self.last_query_start_time)
+    return
+  endif
+  let self.last_query_time = split(reltimestr(reltime(self.last_query_start_time)))[0]
+  call db_ui#notifications#info('Done after '.self.last_query_time.' sec.')
+endfunction
+
 function! db_ui#query#new(drawer) abort
   let s:query_instance = s:query.new(a:drawer)
   return s:query_instance
@@ -232,14 +240,6 @@ function! s:query.execute_query(...) abort
   let self.last_query = lines
 endfunction
 
-function! s:query.print_query_time() abort
-  if empty(self.last_query_start_time)
-    return
-  endif
-  let self.last_query_time = split(reltimestr(reltime(self.last_query_start_time)))[0]
-  call db_ui#notifications#info('Done after '.self.last_query_time.' sec.')
-endfunction
-
 function! s:query.execute_lines(db, lines, is_visual_mode) abort
   let filename = tempname().'.'.db#adapter#call(a:db.conn, 'input_extension', [], 'sql')
   let lines = copy(a:lines)

plugin/db_ui.vim

@@ -18,7 +18,7 @@ let g:db_ui_auto_execute_table_helpers = get(g:, 'db_ui_auto_execute_table_helpe
 let g:db_ui_show_help = get(g:, 'db_ui_show_help', 1)
 let g:db_ui_use_nerd_fonts = get(g:, 'db_ui_use_nerd_fonts', 0)
 let g:db_ui_execute_on_save = get(g:, 'db_ui_execute_on_save', 1)
-let g:db_ui_force_echo_notifications = get(g:, 'db_ui_force_echo_notifications', 0)
+let g:db_ui_force_echo_notifications = get(g:, 'db_ui_force_echo_notifications', 1)
 let g:db_ui_use_nvim_notify = get(g:, 'db_ui_use_nvim_notify', 0)
 let g:Db_ui_buffer_name_generator = get(g:, 'Db_ui_buffer_name_generator', 0)
 let g:db_ui_debug = get(g:, 'db_ui_debug', 0)

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

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

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

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)

test/test-goto-sibling-and-node.vim

@@ -15,7 +15,14 @@ endfunction
 
 function! s:suite.should_jump_to_first_last_sibling() abort
   :DBUI
+  :redir => g:the_dbui_test_output
   norm oj
+  call themis#log(getline(1, '$'))
+  :redir END
+  call themis#log(g:the_dbui_test_output)
+  norm koo
+  call themis#log('-----------')
+  call themis#log(getline(1, '$'))
   call s:expect(line('.')).to_equal(2)
   exe "norm \<C-j>"
   call s:expect(line('.')).to_equal(4)

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

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

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

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

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)

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
 

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)