Merge pull request #640 from LandonTClipp/issue_632

Fixing mockery infinitely generating its own interfaces

.mockery.yaml

@@ -21,10 +21,22 @@ packages:
           - mockname: RequesterVariadicOneArgument
             unroll-variadic: False
           - mockname: RequesterVariadic
+            unroll-variadic: True
       Expecter:
         config:
           with-expecter: True
         configs:
           - mockname: ExpecterAndRolledVariadic
             unroll-variadic: False
+          - mockname: Expecter
+            unroll-variadic: True
       RequesterReturnElided:
+  github.com/vektra/mockery/v2/pkg/fixtures/recursive_generation:
+    config:
+      recursive: True
+      all: True
+      dir: "{{.InterfaceDir}}"
+      filename: "{{.InterfaceName}}_mock.go"
+      mockname: "Mock{{.InterfaceName}}"
+      outpkg: "{{.PackageName}}"
+      inpackage: True

Taskfile.yml

@@ -22,9 +22,15 @@ tasks:
       - "**/*.go"
     cmds:
       - go fmt ./...
+
+  rm_mocks:
+    cmds:
+    - find . -name '*_mock.go' | xargs rm
+    - rm -rf mocks/
 
   mocks:
     desc: generate mockery mocks
+    deps: [rm_mocks]
     cmds:
       - go run .
 
@@ -51,8 +57,21 @@ tasks:
     cmds:
       - go run github.com/golangci/golangci-lint/cmd/golangci-lint run
 
+  test.e2e:
+    desc: run end-to-end tests
+    sources:
+      - "**/*.go"
+      - "./.mockery.yaml"
+    cmds:
+      - ./e2e/run_all.sh
+
   test.ci:
-    deps: [fmt, lint, mocks, test]
+    deps: [fmt, lint]
+    cmds:
+      - task: mocks
+      - task: test
+      - task: test.e2e
+
 
   default:
     deps: [test.ci]

e2e/run_all.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+for file in $(ls $SCRIPT_DIR/test_*.sh); do
+    $file
+done

e2e/test_infinite_mocking.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# This tests https://github.com/vektra/mockery/issues/632, where
+# mockery was generating mocks of its own auto-generated code.
+
+echo "=========="
+echo "RUNNING $0"
+echo "=========="
+
+# New mocks may legimitately be created, so we run mockery once first
+go run .
+num_files_before=$(find . -type f | wc -l)
+go run .
+num_files_after=$(find . -type f | wc -l)
+
+if [ $num_files_before -ne $num_files_after ]; then
+    echo "ERROR: detected increased file count over multiple mockery runs."
+    echo "before: $num_files_before. after: $num_files_after"
+    exit 1
+fi
+echo "SUCCESS: identical number of files over multiple mockery runs"
+

e2e/test_mockery_generation.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+echo "=========="
+echo "RUNNING $0"
+echo "=========="
+
+go run .
+rt=$?
+if [ $rt -ne 0 ]; then
+    echo "ERROR: non-zero return code from mockery"
+    exit 1
+fi
+echo "SUCCESS: successfully generated mocks defined in .mockery.yaml"