diff options
| author | SagePtr <sageptr@gmail.com> | 2018-09-07 03:37:02 +0200 |
|---|---|---|
| committer | techknowlogick <techknowlogick@users.noreply.github.com> | 2018-09-06 21:37:02 -0400 |
| commit | bf552761894dee08f734d91f5c8175cd0cb2f9f5 (patch) | |
| tree | 9287c1142d40ce49e1d407e25ebce08d2a9252a7 /models | |
| parent | 13e8a0fe56cfe13a900df07fffeb246077cfaa96 (diff) | |
| download | gitea-bf552761894dee08f734d91f5c8175cd0cb2f9f5.tar.gz gitea-bf552761894dee08f734d91f5c8175cd0cb2f9f5.zip | |
Fix redirect with non-ascii branch names (#4764) (#4810)
* Fix redirect with non-ascii branch names (#4764)
* Add integration tests for non-ascii branch redirect
* Fix mysql test and coverage test
Diffstat (limited to 'models')
| -rw-r--r-- | models/fixtures/repo_unit.yml | 35 | ||||
| -rw-r--r-- | models/fixtures/repository.yml | 7 | ||||
| -rw-r--r-- | models/fixtures/user.yml | 2 | ||||
| -rw-r--r-- | models/repo_list_test.go | 6 |
4 files changed, 46 insertions, 4 deletions
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index 6780de7531..581f9d6ed5 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -74,3 +74,38 @@ type: 1 config: "{}" created_unix: 1524304355 + +- + id: 12 + repo_id: 33 + type: 1 + config: "{}" + created_unix: 1535593231 + +- + id: 13 + repo_id: 33 + type: 2 + config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}" + created_unix: 1535593231 + +- + id: 14 + repo_id: 33 + type: 3 + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}" + created_unix: 1535593231 + +- + id: 15 + repo_id: 33 + type: 4 + config: "{}" + created_unix: 1535593231 + +- + id: 16 + repo_id: 33 + type: 5 + config: "{}" + created_unix: 1535593231
\ No newline at end of file diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index 3238b65ead..54f3ed7b09 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -400,3 +400,10 @@ num_forks: 0 num_issues: 0 is_mirror: false + +- + id: 33 + owner_id: 2 + lower_name: utf8 + name: utf8 + is_private: false diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index a2e3b88d79..55606e42b9 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -27,7 +27,7 @@ is_admin: false avatar: avatar2 avatar_email: user2@example.com - num_repos: 5 + num_repos: 6 num_stars: 2 num_followers: 2 num_following: 1 diff --git a/models/repo_list_test.go b/models/repo_list_test.go index 164bc19bf0..4b5d659ce2 100644 --- a/models/repo_list_test.go +++ b/models/repo_list_test.go @@ -147,10 +147,10 @@ func TestSearchRepositoryByName(t *testing.T) { count: 14}, {name: "AllPublic/PublicRepositoriesOfUserIncludingCollaborative", opts: &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, AllPublic: true}, - count: 16}, + count: 17}, {name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative", opts: &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true}, - count: 20}, + count: 21}, {name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName", opts: &SearchRepoOptions{Keyword: "test", Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true}, count: 13}, @@ -159,7 +159,7 @@ func TestSearchRepositoryByName(t *testing.T) { count: 11}, {name: "AllPublic/PublicRepositoriesOfOrganization", opts: &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 17, AllPublic: true, Collaborate: util.OptionalBoolFalse}, - count: 16}, + count: 17}, } for _, testCase := range testCases { |