1
0
Fork 0
gitea/integrations
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543)
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

Signed-off-by: a1012112796 <1012112796@qq.com>

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* Apply review suggestions and add test

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

Co-authored-by: silverwind <me@silverwind.io>

* Fix tests and make manually merged disabled error on API the same

Signed-off-by: Andrew Thornton <art27@cantab.net>

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2021-03-03 22:41:23 -05:00
..
gitea-repositories-meta Display SVG files as images instead of text (#14101) 2021-01-12 22:45:19 -05:00
migration-test migrate from com.* to alternatives (#14103) 2020-12-25 11:59:32 +02:00
README.md
README_ZH.md
admin_user_test.go Add option to change username to the admin panel (#14229) 2021-01-10 14:14:02 +02:00
api_admin_org_test.go
api_admin_test.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
api_branch_test.go
api_comment_test.go [Refactor] Move APIFormat functions into convert package (#12856) 2020-10-17 00:23:08 -04:00
api_fork_test.go
api_gpg_keys_test.go
api_helper_for_declarative_test.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
api_issue_label_test.go
api_issue_milestone_test.go [API] Milestone endpoints accept names too (#12649) 2020-09-14 14:48:03 +03:00
api_issue_reaction_test.go [Refactor] Move APIFormat functions into convert package (#12856) 2020-10-17 00:23:08 -04:00
api_issue_stopwatch_test.go Display current stopwatch in navbar (#14122) 2021-01-21 15:51:52 +01:00
api_issue_subscription_test.go
api_issue_test.go Issues overview should not show issues from archived repos (#13220) 2021-01-12 23:19:17 -05:00
api_issue_tracked_time_test.go
api_keys_test.go Disable DSA ssh keys by default (#13056) 2020-10-09 09:52:57 +03:00
api_notification_test.go Extend Notifications API and return pinned notifications by default (#12164) 2020-07-12 00:46:01 +03:00
api_oauth2_apps_test.go
api_org_test.go
api_pull_review_test.go Add dismiss review feature (#12674) 2021-02-11 18:32:25 +01:00
api_pull_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
api_releases_test.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 2021-02-07 19:32:18 +01:00
api_repo_edit_test.go
api_repo_file_create_test.go
api_repo_file_delete_test.go
api_repo_file_helpers.go
api_repo_file_update_test.go
api_repo_get_contents_list_test.go
api_repo_get_contents_test.go
api_repo_git_blobs_test.go
api_repo_git_commits_test.go [API] Add affected files of commits to commit struct (#14579) 2021-02-07 15:43:40 +01:00
api_repo_git_hook_test.go
api_repo_git_ref_test.go
api_repo_git_tags_test.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 2021-02-07 19:32:18 +01:00
api_repo_git_trees_test.go
api_repo_languages_test.go
api_repo_lfs_locks_test.go
api_repo_raw_test.go
api_repo_tags_test.go
api_repo_teams_test.go [API] List, Check, Add & delete endpoints for repository teams (#13630) 2021-02-01 22:57:12 +01:00
api_repo_test.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
api_repo_topic_test.go
api_settings_test.go Export LFS & TimeTracking function status (#14753) 2021-02-20 11:17:51 +01:00
api_team_test.go
api_team_user_test.go
api_token_test.go [API] Delete Token accept names too (#12366) 2020-08-28 11:09:33 +03:00
api_user_heatmap_test.go Update heatmap fixtures to restore tests (#13224) 2020-10-20 17:39:25 -05:00
api_user_orgs_test.go Extend TestUserOrgs to cover permission cases (#14495) 2021-01-28 22:40:41 +01:00
api_user_search_test.go Convert User expose ID each time (#12855) 2020-09-17 16:33:23 -05:00
attachment_test.go Display current stopwatch in navbar (#14122) 2021-01-21 15:51:52 +01:00
auth_ldap_test.go Accept multiple SSH keys in single LDAP SSHPublicKey attribute (#13989) 2020-12-18 17:44:18 +00:00
benchmarks_test.go
branches_test.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
change_default_branch_test.go
cmd_keys_test.go Completely quote AppPath and CustomConf paths (#12955) 2020-09-28 21:16:52 -04:00
cors_test.go
create_no_session_test.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
delete_user_test.go Add option to change username to the admin panel (#14229) 2021-01-10 14:14:02 +02:00
download_test.go Display SVG files as images instead of text (#14101) 2021-01-12 22:45:19 -05:00
editor_test.go
empty_repo_test.go
eventsource_test.go Extend Notifications API and return pinned notifications by default (#12164) 2020-07-12 00:46:01 +03:00
explore_repos_test.go
git_helper_for_declarative_test.go migrate from com.* to alternatives (#14103) 2020-12-25 11:59:32 +02:00
git_test.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
gpg_git_test.go Re-attempt to delete temporary upload if the file is locked by another process (#12447) 2020-08-11 21:05:34 +01:00
html_helper.go Remove obsolete change of email on profile page (#13341) 2020-10-28 22:33:14 +00:00
integration_test.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
issue_test.go
lfs_getobject_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
links_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
mssql.ini.tmpl Update docs and comments to remove macaron (#14491) 2021-01-29 16:35:30 +01:00
mysql.ini.tmpl Update docs and comments to remove macaron (#14491) 2021-01-29 16:35:30 +01:00
mysql8.ini.tmpl Update docs and comments to remove macaron (#14491) 2021-01-29 16:35:30 +01:00
nonascii_branches_test.go
oauth_test.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
org_count_test.go
org_test.go
pgsql.ini.tmpl Update docs and comments to remove macaron (#14491) 2021-01-29 16:35:30 +01:00
private-testing.key
privateactivity_test.go rework heatmap permissions (#14080) 2020-12-22 03:53:37 +01:00
pull_compare_test.go
pull_create_test.go
pull_merge_test.go Some code improvements (#14266) 2021-01-06 19:23:57 +00:00
pull_review_test.go
pull_status_test.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
pull_update_test.go Add API to update pr headBranch (#12419) 2020-08-04 21:55:22 +01:00
release_test.go Add the tag list page to the release page (#12096) 2020-11-02 18:10:22 -05:00
repo_activity_test.go
repo_branch_test.go Make TestCreateBranch and TestRepoCommitsSearch less noisy (#13471) 2020-11-08 16:24:54 -05:00
repo_commits_search_test.go Make TestCreateBranch and TestRepoCommitsSearch less noisy (#13471) 2020-11-08 16:24:54 -05:00
repo_commits_test.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
repo_fork_test.go
repo_generate_test.go
repo_migrate_test.go Add a migrate service type switch page (#12697) 2020-09-09 14:29:10 -04:00
repo_search_test.go Add queue for code indexer (#10332) 2020-09-07 23:05:08 +08:00
repo_test.go Fix file table overflows (#12603) 2020-08-26 11:52:44 -04:00
repo_watch_test.go
repofiles_delete_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
repofiles_update_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
setting_test.go
signin_test.go
signout_test.go
signup_test.go Add email validity check (#13475) 2020-11-14 11:53:43 -05:00
sqlite.ini.tmpl Update docs and comments to remove macaron (#14491) 2021-01-29 16:35:30 +01:00
ssh_key_test.go Re-attempt to delete temporary upload if the file is locked by another process (#12447) 2020-08-11 21:05:34 +01:00
testlogger.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
timetracking_test.go Remove JS globals related to timetracking and due date (#13921) 2020-12-10 17:19:18 +01:00
user_test.go User Settings: Ignore empty language codes & validate (#13755) 2020-12-04 08:20:30 +02:00
version_test.go
view_test.go Display SVG files as images instead of text (#14101) 2021-01-12 22:45:19 -05:00
xss_test.go User Settings: Ignore empty language codes & validate (#13755) 2020-12-04 08:20:30 +02:00

README.md

Integrations tests

Integration tests can be run with make commands for the appropriate backends, namely:

make test-mysql
make test-pgsql
make test-sqlite

Make sure to perform a clean build before running tests:

make clean build

Run all tests via local drone

drone exec --local --build-event "pull_request"

Run sqlite integrations tests

Start tests

make test-sqlite

Run mysql integrations 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)
docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a secound terminal, just ctrl-c to stop db and clean the container)

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

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)

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

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)

Start tests based on the database container

TEST_MSSQL_HOST=localhost:1433 TEST_MSSQL_DBNAME=gitea_test TEST_MSSQL_USERNAME=sa TEST_MSSQL_PASSWORD=MwantsaSecurePassword1 make test-mssql

Running individual tests

Example command to run GPG test:

For sqlite:

make test-sqlite#GPG

For other databases(replace MSSQL to MYSQL, MYSQL8, PGSQL):

TEST_MSSQL_HOST=localhost:1433 TEST_MSSQL_DBNAME=test TEST_MSSQL_USERNAME=sa TEST_MSSQL_PASSWORD=MwantsaSecurePassword1 make test-mssql#GPG

Setting timeouts for declaring long-tests and long-flushes

We appreciate that some testing machines may not be very powerful and the default timeouts for declaring a slow test or a slow clean-up flush may not be appropriate.

You can either:

  • Within the test ini file set the following section:
[integration-tests]
SLOW_TEST = 10s ; 10s is the default value
SLOW_FLUSH = 5S ; 5s is the default value
  • Set the following environment variables:
GITEA_SLOW_TEST_TIME="10s" GITEA_SLOW_FLUSH_TIME="5s" make test-sqlite