test: add missing formatting coverage

Author: Jose Alvarez

lua/null-ls/formatting.lua

@@ -35,9 +35,8 @@ local apply_edits = a.async_void(function(params)
     -- default handler doesn't accept bufnr, so call util directly
     lsp.util.apply_text_edits(edits, bufnr)
 
-    if c.get().save_after_format and bufnr == api.nvim_get_current_buf() then
-        vim.cmd("silent noautocmd :update")
-    end
+    if not _G._TEST and c.get().save_after_format and bufnr ==
+        api.nvim_get_current_buf() then vim.cmd("silent noautocmd :update") end
 end)
 
 M.handler = function(method, original_params, _, bufnr)

test/files/test-file.js

@@ -0,0 +1 @@
+import {User} from "./test-types"

test/spec/e2e_spec.lua

@@ -16,8 +16,9 @@ local lsp_wait = function() vim.wait(400) end
 main.setup()
 
 describe("e2e", function()
+    _G._TEST = true
     after_each(function()
-        vim.cmd("bufdo! bwipeout!")
+        vim.cmd("bufdo! bdelete!")
         c.reset_sources()
     end)
 
@@ -118,7 +119,7 @@ describe("e2e", function()
         end)
 
         it("should combine diagnostics from multiple sources", function()
-            vim.cmd("bufdo! bwipeout!")
+            vim.cmd("bufdo! bdelete!")
 
             c.register(builtins._test.mock_diagnostics)
             tu.edit_test_file("test-file.md")
@@ -127,6 +128,27 @@ describe("e2e", function()
             assert.equals(vim.tbl_count(lsp.diagnostic.get()), 2)
         end)
     end)
+
+    describe("formatting", function()
+        local formatted = "import { User } from \"./test-types\";\n"
+
+        before_each(function()
+            c.register(builtins.formatting.prettier)
+
+            tu.edit_test_file("test-file.js")
+            -- make sure file wasn't accidentally saved
+            assert.is_not.equals(u.buf.content(nil, true), formatted)
+
+            lsp_wait()
+        end)
+
+        it("should format file", function()
+            lsp.buf.formatting()
+            lsp_wait()
+
+            assert.equals(u.buf.content(nil, true), formatted)
+        end)
+    end)
 end)
 
 main.shutdown()

test/spec/helpers_spec.lua

@@ -260,6 +260,62 @@ describe("helpers", function()
         end)
     end)
 
+    describe("formatter_factory", function()
+        local opts = {key = "val"}
+
+        before_each(function() stub(helpers, "generator_factory") end)
+        after_each(function()
+            helpers.generator_factory:clear()
+            helpers.generator_factory:revert()
+        end)
+
+        it("should call generator_factory with enriched opts", function()
+            helpers.formatter_factory(opts)
+
+            assert.stub(helpers.generator_factory).was_called_with(opts)
+            assert.equals(helpers.generator_factory.calls[1].refs[1]
+                              .ignore_errors, true)
+            assert.truthy(helpers.generator_factory.calls[1].refs[1].on_output)
+        end)
+
+        describe("on_output", function()
+            local formatter_done = stub.new()
+            after_each(function() formatter_done:clear() end)
+
+            it("should call done and return if no output", function()
+                helpers.formatter_factory(opts)
+                local on_formatter_output =
+                    helpers.generator_factory.calls[1].refs[1].on_output
+
+                on_formatter_output({}, formatter_done)
+
+                assert.stub(formatter_done).was_called()
+            end)
+
+            it("should call done with edit object", function()
+                helpers.formatter_factory(opts)
+                local on_formatter_output =
+                    helpers.generator_factory.calls[1].refs[1].on_output
+
+                on_formatter_output({
+                    output = "new text",
+                    content = {"line1", "line"}
+                }, formatter_done)
+
+                assert.stub(formatter_done).was_called_with(
+                    {
+                        {
+                            row = 0,
+                            col = 0,
+                            end_row = 2,
+                            end_col = -1,
+                            text = "new text"
+                        }
+                    })
+            end)
+        end)
+    end)
+
     describe("make_builtin", function()
         local opts = {
             method = "mockMethod",