From 3aa358b0abf522d64f2c175eefe6ba8c0cdabd29 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 12 Oct 2018 23:33:07 +0800 Subject: [PATCH 1/2] fix release creation via API --- models/release.go | 4 +- models/release_test.go | 96 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 models/release_test.go diff --git a/models/release.go b/models/release.go index 1f03ed782d3c3..44d028a26f3b5 100644 --- a/models/release.go +++ b/models/release.go @@ -115,9 +115,9 @@ func createTag(gitRepo *git.Repository, rel *Release) error { // Only actual create when publish. if !rel.IsDraft { if !gitRepo.IsTagExist(rel.TagName) { - commit, err := gitRepo.GetBranchCommit(rel.Target) + commit, err := gitRepo.GetCommit(rel.Target) if err != nil { - return fmt.Errorf("GetBranchCommit: %v", err) + return fmt.Errorf("GetCommit: %v", err) } // Trim '--' prefix to prevent command line argument vulnerability. diff --git a/models/release_test.go b/models/release_test.go new file mode 100644 index 0000000000000..f23ea3752c80f --- /dev/null +++ b/models/release_test.go @@ -0,0 +1,96 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "testing" + + "code.gitea.io/git" + + "github.com/stretchr/testify/assert" +) + +func TestRelease_Create(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + repo := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository) + repoPath := RepoPath(user.Name, repo.Name) + + gitRepo, err := git.OpenRepository(repoPath) + assert.NoError(t, err) + + assert.NoError(t, CreateRelease(gitRepo, &Release{ + RepoID: repo.ID, + PublisherID: user.ID, + TagName: "v0.1", + Target: "master", + Title: "v0.1 is released", + Note: "v0.1 is released", + IsDraft: false, + IsPrerelease: false, + IsTag: false, + }, nil)) + + assert.NoError(t, CreateRelease(gitRepo, &Release{ + RepoID: repo.ID, + PublisherID: user.ID, + TagName: "v0.1.1", + Target: "65f1bf27bc3bf70f64657658635e66094edbcb4d", + Title: "v0.1.1 is released", + Note: "v0.1.1 is released", + IsDraft: false, + IsPrerelease: false, + IsTag: false, + }, nil)) + + assert.NoError(t, CreateRelease(gitRepo, &Release{ + RepoID: repo.ID, + PublisherID: user.ID, + TagName: "v0.1.2", + Target: "65f1bf2", + Title: "v0.1.2 is released", + Note: "v0.1.2 is released", + IsDraft: false, + IsPrerelease: false, + IsTag: false, + }, nil)) + + assert.NoError(t, CreateRelease(gitRepo, &Release{ + RepoID: repo.ID, + PublisherID: user.ID, + TagName: "v0.1.2", + Target: "65f1bf2", + Title: "v0.1.2 is released", + Note: "v0.1.2 is released", + IsDraft: true, + IsPrerelease: false, + IsTag: false, + }, nil)) + + assert.NoError(t, CreateRelease(gitRepo, &Release{ + RepoID: repo.ID, + PublisherID: user.ID, + TagName: "v0.1.2", + Target: "65f1bf2", + Title: "v0.1.2 is released", + Note: "v0.1.2 is released", + IsDraft: false, + IsPrerelease: true, + IsTag: false, + }, nil)) + + assert.NoError(t, CreateRelease(gitRepo, &Release{ + RepoID: repo.ID, + PublisherID: user.ID, + TagName: "v0.1.2", + Target: "65f1bf2", + Title: "v0.1.2 is released", + Note: "v0.1.2 is released", + IsDraft: false, + IsPrerelease: false, + IsTag: true, + }, nil)) +} From 6df92e31d59ff44b37b7690628c874dbf1f6874f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 15 Oct 2018 10:35:20 +0800 Subject: [PATCH 2/2] fix release create tests --- models/release_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/models/release_test.go b/models/release_test.go index f23ea3752c80f..de3155f6bd55e 100644 --- a/models/release_test.go +++ b/models/release_test.go @@ -61,10 +61,10 @@ func TestRelease_Create(t *testing.T) { assert.NoError(t, CreateRelease(gitRepo, &Release{ RepoID: repo.ID, PublisherID: user.ID, - TagName: "v0.1.2", + TagName: "v0.1.3", Target: "65f1bf2", - Title: "v0.1.2 is released", - Note: "v0.1.2 is released", + Title: "v0.1.3 is released", + Note: "v0.1.3 is released", IsDraft: true, IsPrerelease: false, IsTag: false, @@ -73,10 +73,10 @@ func TestRelease_Create(t *testing.T) { assert.NoError(t, CreateRelease(gitRepo, &Release{ RepoID: repo.ID, PublisherID: user.ID, - TagName: "v0.1.2", + TagName: "v0.1.4", Target: "65f1bf2", - Title: "v0.1.2 is released", - Note: "v0.1.2 is released", + Title: "v0.1.4 is released", + Note: "v0.1.4 is released", IsDraft: false, IsPrerelease: true, IsTag: false, @@ -85,10 +85,10 @@ func TestRelease_Create(t *testing.T) { assert.NoError(t, CreateRelease(gitRepo, &Release{ RepoID: repo.ID, PublisherID: user.ID, - TagName: "v0.1.2", + TagName: "v0.1.5", Target: "65f1bf2", - Title: "v0.1.2 is released", - Note: "v0.1.2 is released", + Title: "v0.1.5 is released", + Note: "v0.1.5 is released", IsDraft: false, IsPrerelease: false, IsTag: true,