Merge pull request #683 from LandonTClipp/issue_681_e2e

Add e2e tests for issue #681

Taskfile.yml

@@ -1,15 +1,6 @@
 version: "3"
 
 tasks:
-  test:
-    cmds:
-      - go test -v -coverprofile=coverage.txt ./...
-    desc: run unit tests
-    sources:
-      - "**/*.go"
-    generates:
-      - coverage.txt
-
   coverage:
     deps: [test]
     desc: run unit tests and create HTML coverage file
@@ -23,14 +14,14 @@ tasks:
     cmds:
       - go fmt ./...
 
-  rm_mocks:
+  mocks.remove:
+    desc: remove all mock files
     cmds:
     - find . -name '*_mock.go' | xargs rm
     - rm -rf mocks/
 
-  mocks:
+  mocks.generate:
     desc: generate mockery mocks
-    deps: [rm_mocks]
     cmds:
       - go run .
 
@@ -41,6 +32,8 @@ tasks:
 
   mkdocs.install:
     desc: install mkdocs and plugins
+    sources:
+      - "docs/requirements.txt"
     cmds:
       - pip install -r docs/requirements.txt
 
@@ -57,6 +50,15 @@ tasks:
     cmds:
       - go run github.com/golangci/golangci-lint/cmd/golangci-lint run
 
+  test:
+    cmds:
+      - go test -v -coverprofile=coverage.txt ./...
+    desc: run unit tests
+    sources:
+      - "**/*.go"
+    generates:
+      - coverage.txt
+
   test.e2e:
     desc: run end-to-end tests
     sources:
@@ -68,7 +70,8 @@ tasks:
   test.ci:
     deps: [fmt, lint]
     cmds:
-      - task: mocks
+      - task: mocks.remove
+      - task: mocks.generate
       - task: test
       - task: test.e2e
 

e2e/run_all.sh

@@ -2,5 +2,10 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 for file in $(ls $SCRIPT_DIR/test_*.sh); do
+    echo "=========="
+    echo "RUNNING $file"
+    echo "=========="
+    go run github.com/go-task/task/v3/cmd/task mocks.remove || exit 1
+    go run github.com/go-task/task/v3/cmd/task mocks.generate || exit 1
     $file
 done

e2e/test_infinite_mocking.sh

@@ -2,14 +2,9 @@
 # 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 .
+go run github.com/go-task/task/v3/cmd/task mocks.generate
 num_files_after=$(find . -type f | wc -l)
 
 if [ $num_files_before -ne $num_files_after ]; then

e2e/test_mockery_generation.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-echo "=========="
-echo "RUNNING $0"
-echo "=========="
-
-go run .
+go run github.com/go-task/task/v3/cmd/task mocks.generate
 rt=$?
 if [ $rt -ne 0 ]; then
     echo "ERROR: non-zero return code from mockery"

e2e/test_recursive_package_with_only_autogenerated_files.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# This tests https://github.com/vektra/mockery/pull/682
+
+FILE="pkg/fixtures/recursive_generation/subpkg_with_only_autogenerated_files/Foo_mock.go"
+if ! [ -f $FILE ]; then
+    echo "ERROR: $FILE does not exist"
+    exit 1
+fi