chore: don't hardcode bufnr in assertion

Author: xiaoshihou514

CONTRIBUTING.md

@@ -48,7 +48,7 @@ describe('selene', function()
     require('guard').setup()
     -- Giving example input to the helper
     -- the helper creates a new buffer with it, requires lint, and returns the diagnostics
-    local diagnostics = require('test.linter.helper').test_with('lua', {
+    local buf, diagnostics = require('test.linter.helper').test_with('lua', {
       -- Make sure the input actually has some problems that the linter detects
       [[local M = {}]],
       [[function M.foo()]],
@@ -60,7 +60,7 @@ describe('selene', function()
     -- Show that the diagnostics is indeed valid
     assert.are.same({
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 0,
         end_col = 0,
         end_lnum = 4,

test/linter/clang-tidy_spec.lua

@@ -5,7 +5,7 @@ describe('clang-tidy', function()
     local ft = require('guard.filetype')
     ft('c'):lint('clang-tidy')
 
-    local diagnostics = helper.test_with('c', {
+    local buf, diagnostics = helper.test_with('c', {
       [[#include <stdio.h>]],
       [[int main() {]],
       [[    int x = 10;]],
@@ -16,7 +16,7 @@ describe('clang-tidy', function()
     })
     assert.are.same({
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 19,
         end_col = 19,
         end_lnum = 4,

test/linter/flake8_spec.lua

@@ -5,7 +5,7 @@ describe('flake8', function()
     local ft = require('guard.filetype')
     ft('python'):lint('flake8')
 
-    local diagnostics = helper.test_with('python', {
+    local buf, diagnostics = helper.test_with('python', {
       [[import os]],
       [[]],
       [[def foo(n):]],
@@ -15,7 +15,7 @@ describe('flake8', function()
     })
     assert.are.same({
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 0,
         end_col = 0,
         end_lnum = 0,
@@ -26,7 +26,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 0,
         end_col = 0,
         end_lnum = 2,
@@ -37,7 +37,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 9,
         end_col = 9,
         end_lnum = 4,
@@ -48,7 +48,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 9,
         end_col = 9,
         end_lnum = 4,
@@ -59,7 +59,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 15,
         end_col = 15,
         end_lnum = 4,
@@ -70,7 +70,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 17,
         end_col = 17,
         end_lnum = 4,
@@ -81,7 +81,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 0,
         end_col = 0,
         end_lnum = 5,
@@ -92,7 +92,7 @@ describe('flake8', function()
         source = 'flake8',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 79,
         end_col = 79,
         end_lnum = 5,

test/linter/helper.lua

@@ -16,7 +16,7 @@ function M.test_with(ft, input)
 
   lint.do_lint(bufnr)
   vim.wait(3000)
-  return vim.diagnostic.get(bufnr)
+  return bufnr, vim.diagnostic.get(bufnr)
 end
 
 return M

test/linter/hlint_spec.lua

@@ -5,14 +5,14 @@ describe('hlint', function()
     local ft = require('guard.filetype')
     ft('haskell'):lint('hlint')
 
-    local diagnostics = helper.test_with('haskell', {
+    local buf, diagnostics = helper.test_with('haskell', {
       [[concat $ map escapeC s]],
       [[ftable ++ (map (\ (c, x) -> (toUpper c, urlEncode x)) ftable)]],
       [[mapM (delete_line (fn2fp f) line) old]],
     })
     assert.are.same({
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 0,
         end_col = 0,
         end_lnum = 0,
@@ -23,7 +23,7 @@ describe('hlint', function()
         source = 'hlint',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 10,
         end_col = 10,
         end_lnum = 1,
@@ -34,7 +34,7 @@ describe('hlint', function()
         source = 'hlint',
       },
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 16,
         end_col = 16,
         end_lnum = 1,

test/linter/luacheck_spec.lua

@@ -5,7 +5,7 @@ describe('luacheck', function()
     local ft = require('guard.filetype')
     ft('lua'):lint('luacheck')
 
-    local diagnostics = helper.test_with('lua', {
+    local buf, diagnostics = helper.test_with('lua', {
       [[local M = {}]],
       [[function M.foo()]],
       [[  print("foo")]],
@@ -15,7 +15,7 @@ describe('luacheck', function()
     })
     assert.are.same({
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 0,
         end_col = 0,
         end_lnum = 4,

test/linter/pylint_spec.lua

@@ -5,12 +5,12 @@ describe('selene', function()
     local ft = require('guard.filetype')
     ft('lua'):lint('selene')
 
-    local diagnostics = helper.test_with('lua', {
+    local buf, diagnostics = helper.test_with('lua', {
       [[print(a)]],
     })
     assert.are.same({
       {
-        bufnr = 3,
+        bufnr = buf,
         col = 6,
         end_col = 0,
         end_lnum = 0,