tests integrations to tests integraton

Author: kdumontnu

.gitignore

@@ -63,16 +63,16 @@ cpu.out
 /indexers
 /log
 /public/img/avatar
-/tests/integrations/gitea-integration-mysql
-/tests/integrations/gitea-integration-mysql8
-/tests/integrations/gitea-integration-pgsql
-/tests/integrations/gitea-integration-sqlite
-/tests/integrations/gitea-integration-mssql
-/tests/integrations/indexers-mysql
-/tests/integrations/indexers-mysql8
-/tests/integrations/indexers-pgsql
-/tests/integrations/indexers-sqlite
-/tests/integrations/indexers-mssql
+/tests/integration/gitea-integration-mysql
+/tests/integration/gitea-integration-mysql8
+/tests/integration/gitea-integration-pgsql
+/tests/integration/gitea-integration-sqlite
+/tests/integration/gitea-integration-mssql
+/tests/integration/indexers-mysql
+/tests/integration/indexers-mysql8
+/tests/integration/indexers-pgsql
+/tests/integration/indexers-sqlite
+/tests/integration/indexers-mssql
 /tests/sqlite.ini
 /tests/mysql.ini
 /tests/mysql8.ini

CONTRIBUTING.md

@@ -86,8 +86,8 @@ Here's how to run the test suite:
 |                                        |                                                  |
 | :------------------------------------- | :----------------------------------------------- |
 |``make test[\#TestSpecificName]``       |  run unit test  |
-|``make test-sqlite[\#TestSpecificName]``|  run [integration](integrations) test for SQLite |  
-|[More details about integrations](integrations/README.md)  |
+|``make test-sqlite[\#TestSpecificName]``|  run [integration](tests/integration) test for SQLite |  
+|[More details about integrations](tests/integration/README.md)  |
 
 ## Vendoring
 
@@ -167,7 +167,7 @@ import (
 
 To maintain understandable code and avoid circular dependencies it is important to have a good structure of the code. The Gitea code is divided into the following parts:
 
-- **integration:** Integrations tests
+- **integration:** Integration tests
 - **models:** Contains the data structures used by xorm to construct database tables. It also contains supporting functions to query and update the database. Dependencies to other code in Gitea should be avoided although some modules might be needed (for example for logging).
 - **models/fixtures:** Sample model data used in integration tests.
 - **models/migrations:** Handling of database migrations between versions. PRs that changes a database structure shall also have a migration step.

Makefile

@@ -99,7 +99,7 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
 
 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
 
-GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/tests/integrations/migration-test code.gitea.io/gitea/tests/integrations code.gitea.io/gitea/tests,$(shell $(GO) list ./... | grep -v /vendor/))
+GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests,$(shell $(GO) list ./... | grep -v /vendor/))
 
 FOMANTIC_WORK_DIR := web_src/fomantic
 
@@ -242,9 +242,9 @@ clean:
 	$(GO) clean -i ./...
 	rm -rf $(EXECUTABLE) $(DIST) $(BINDATA_DEST) $(BINDATA_HASH) \
 		integrations*.test \
-		tests/integrations/gitea-integration-pgsql/ tests/integrations/gitea-integration-mysql/ tests/integrations/gitea-integration-mysql8/ tests/integrations/gitea-integration-sqlite/ \
-		tests/integrations/gitea-integration-mssql/ tests/integrations/indexers-mysql/ tests/integrations/indexers-mysql8/ tests/integrations/indexers-pgsql tests/integrations/indexers-sqlite \
-		tests/integrations/indexers-mssql tests/mysql.ini tests/mysql8.ini tests/pgsql.ini tests/mssql.ini man/
+		tests/integration/gitea-integration-pgsql/ tests/integration/gitea-integration-mysql/ tests/integration/gitea-integration-mysql8/ tests/integration/gitea-integration-sqlite/ \
+		tests/integration/gitea-integration-mssql/ tests/integration/indexers-mysql/ tests/integration/indexers-mysql8/ tests/integration/indexers-pgsql tests/integration/indexers-sqlite \
+		tests/integration/indexers-mssql tests/mysql.ini tests/mysql8.ini tests/pgsql.ini tests/mssql.ini man/
 
 .PHONY: fmt
 fmt:
@@ -589,45 +589,45 @@ integration-test-coverage-sqlite: integrations.cover.sqlite.test generate-ini-sq
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.cover.sqlite.test -test.coverprofile=integration.coverage.out
 
 integrations.mysql.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -o integrations.mysql.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test
 
 integrations.mysql8.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -o integrations.mysql8.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql8.test
 
 integrations.pgsql.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -o integrations.pgsql.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test
 
 integrations.mssql.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -o integrations.mssql.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mssql.test
 
 integrations.sqlite.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -o integrations.sqlite.test -tags '$(TEST_TAGS)'
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)'
 
 integrations.cover.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.test
 
 integrations.cover.sqlite.test: git-check $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)'
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)'
 
 .PHONY: migrations.mysql.test
 migrations.mysql.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations/migration-test -o migrations.mysql.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test
 
 .PHONY: migrations.mysql8.test
 migrations.mysql8.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations/migration-test -o migrations.mysql8.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql8.test
 
 .PHONY: migrations.pgsql.test
 migrations.pgsql.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations/migration-test -o migrations.pgsql.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test
 
 .PHONY: migrations.mssql.test
 migrations.mssql.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations/migration-test -o migrations.mssql.test
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mssql.test
 
 .PHONY: migrations.sqlite.test
 migrations.sqlite.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integrations/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)'
+	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)'
 
 .PHONY: migrations.individual.mysql.test
 migrations.individual.mysql.test: $(GO_SOURCES)

docs/content/doc/developers/guidelines-backend.md

@@ -33,7 +33,8 @@ To maintain understandable code and avoid circular dependencies it is important
 
 - `build`: Scripts to help build Gitea.
 - `cmd`: All Gitea actual sub commands includes web, doctor, serv, hooks, admin and etc. `web` will start the web service. `serv` and `hooks` will be invoked by Git or OpenSSH. Other sub commands could help to maintain Gitea.
-- `integrations`: Integration tests
+- `tests`: Tests
+  - `tests/integration`: Integration tests
 - `models`: Contains the data structures used by xorm to construct database tables. It also contains functions to query and update the database. Dependencies to other Gitea code should be avoided. You can make exceptions in cases such as logging.
   - `models/db`: Basic database operations. All other `models/xxx` packages should depend on this package. The `GetEngine` function should only be invoked from `models/`.
   - `models/fixtures`: Sample data used in unit tests and integration tests. One `yml` file means one table which will be loaded into database when beginning the tests.

docs/content/doc/developers/hacking-on-gitea.en-us.md

@@ -309,7 +309,7 @@ will run the integration tests in an SQLite environment. Integration tests
 require `git lfs` to be installed. Other database tests are available but
 may need adjustment to the local environment.
 
-Take a look at [`tests/integrations/README.md`](https://github.com/go-gitea/gitea/blob/main/tests/integrations/README.md)
+Take a look at [`tests/integration/README.md`](https://github.com/go-gitea/gitea/blob/main/tests/integration/README.md)
 for more information and how to run a single test.
 
 

tests/integrations/README.md renamed to tests/integration/README.md

@@ -1,4 +1,4 @@
-# Integrations tests
+# Integration tests
 
 Integration tests can be run with make commands for the
 appropriate backends, namely:
@@ -18,13 +18,13 @@ make clean build
 drone exec --local --build-event "pull_request"
 ```
 
-## Run sqlite integrations tests
+## Run sqlite integration tests
 Start tests
 ```
 make test-sqlite
 ```
 
-## Run MySQL integrations tests
+## Run MySQL integration tests
 Setup a MySQL database inside docker
 ```
 docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container)
@@ -35,7 +35,7 @@ Start tests based on the database container
 TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-mysql
 ```
 
-## Run pgsql integrations tests
+## Run pgsql integration tests
 Setup a pgsql database inside docker
 ```
 docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:latest #(just ctrl-c to stop db and clean the container)
@@ -45,7 +45,7 @@ Start tests based on the database container
 TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql
 ```
 
-## Run mssql integrations tests
+## Run mssql integration tests
 Setup a mssql database inside docker
 ```
 docker run -e "ACCEPT_EULA=Y" -e "MSSQL_PID=Standard" -e "SA_PASSWORD=MwantsaSecurePassword1" -p 1433:1433 --rm --name mssql microsoft/mssql-server-linux:latest #(just ctrl-c to stop db and clean the container)

tests/integrations/README_ZH.md renamed to tests/integration/README_ZH.md

@@ -43,7 +43,7 @@ docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:14 #(ju
 TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql
 ```
 
-## Run mssql integrations tests
+## Run mssql integration tests
 同上，首先在 docker 容器里部署一个 mssql 数据库
 ```
 docker run -e "ACCEPT_EULA=Y" -e "MSSQL_PID=Standard" -e "SA_PASSWORD=MwantsaSecurePassword1" -p 1433:1433 --rm --name mssql microsoft/mssql-server-linux:latest #(just ctrl-c to stop db and clean the container) 

tests/integrations/admin_user_test.go renamed to tests/integration/admin_user_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_activitypub_person_test.go renamed to tests/integration/api_activitypub_person_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"context"

tests/integrations/api_admin_org_test.go renamed to tests/integration/api_admin_org_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_admin_test.go renamed to tests/integration/api_admin_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_branch_test.go renamed to tests/integration/api_branch_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_comment_test.go renamed to tests/integration/api_comment_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_fork_test.go renamed to tests/integration/api_fork_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_gpg_keys_test.go renamed to tests/integration/api_gpg_keys_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_helper_for_declarative_test.go renamed to tests/integration/api_helper_for_declarative_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"context"

tests/integrations/api_httpsig_test.go renamed to tests/integration/api_httpsig_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"encoding/base64"

tests/integrations/api_issue_label_test.go renamed to tests/integration/api_issue_label_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_issue_milestone_test.go renamed to tests/integration/api_issue_milestone_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_issue_reaction_test.go renamed to tests/integration/api_issue_reaction_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_issue_stopwatch_test.go renamed to tests/integration/api_issue_stopwatch_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_issue_subscription_test.go renamed to tests/integration/api_issue_subscription_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_issue_test.go renamed to tests/integration/api_issue_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_issue_tracked_time_test.go renamed to tests/integration/api_issue_tracked_time_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_keys_test.go renamed to tests/integration/api_keys_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_nodeinfo_test.go renamed to tests/integration/api_nodeinfo_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"

tests/integrations/api_notification_test.go renamed to tests/integration/api_notification_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_oauth2_apps_test.go renamed to tests/integration/api_oauth2_apps_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.package models
 
-package integrations
+package integration
 
 import (
 	"fmt"

tests/integrations/api_org_test.go renamed to tests/integration/api_org_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package integrations
+package integration
 
 import (
 	"net/http"