From f3833b7ce4dc78095194808c6e07d8ae133e7ab5 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Sun, 15 Oct 2017 22:59:24 +0300 Subject: Create new branch from branch selection dropdown (#2130) * Create new branch from branch selection dropdown and rewrite it to VueJS * Make updateLocalCopyToCommit as not exported * Move branch name validation to model * Fix possible race condition --- integrations/repo_branch_test.go | 132 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 integrations/repo_branch_test.go (limited to 'integrations') diff --git a/integrations/repo_branch_test.go b/integrations/repo_branch_test.go new file mode 100644 index 0000000000..32e24e83fb --- /dev/null +++ b/integrations/repo_branch_test.go @@ -0,0 +1,132 @@ +// Copyright 2017 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 integrations + +import ( + "net/http" + "path" + "strings" + "testing" + + "github.com/Unknwon/i18n" + "github.com/stretchr/testify/assert" +) + +func testCreateBranch(t *testing.T, session *TestSession, user, repo, oldRefName, newBranchName string, expectedStatus int) string { + var csrf string + if expectedStatus == http.StatusNotFound { + csrf = GetCSRF(t, session, path.Join(user, repo, "src/master")) + } else { + csrf = GetCSRF(t, session, path.Join(user, repo, "src", oldRefName)) + } + req := NewRequestWithValues(t, "POST", path.Join(user, repo, "branches/_new", oldRefName), map[string]string{ + "_csrf": csrf, + "new_branch_name": newBranchName, + }) + resp := session.MakeRequest(t, req, expectedStatus) + if expectedStatus != http.StatusFound { + return "" + } + return RedirectURL(t, resp) +} + +func TestCreateBranch(t *testing.T) { + tests := []struct { + OldBranchOrCommit string + NewBranch string + CreateRelease string + FlashMessage string + ExpectedStatus int + }{ + { + OldBranchOrCommit: "master", + NewBranch: "feature/test1", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "repo.branch.create_success", "feature/test1"), + }, + { + OldBranchOrCommit: "master", + NewBranch: "", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "form.NewBranchName") + i18n.Tr("en", "form.require_error"), + }, + { + OldBranchOrCommit: "master", + NewBranch: "feature=test1", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "form.NewBranchName") + i18n.Tr("en", "form.git_ref_name_error"), + }, + { + OldBranchOrCommit: "master", + NewBranch: strings.Repeat("b", 101), + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "form.NewBranchName") + i18n.Tr("en", "form.max_size_error", "100"), + }, + { + OldBranchOrCommit: "master", + NewBranch: "master", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "repo.branch.branch_already_exists", "master"), + }, + { + OldBranchOrCommit: "master", + NewBranch: "master/test", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "repo.branch.branch_name_conflict", "master/test", "master"), + }, + { + OldBranchOrCommit: "acd1d892867872cb47f3993468605b8aa59aa2e0", + NewBranch: "feature/test2", + ExpectedStatus: http.StatusNotFound, + }, + { + OldBranchOrCommit: "65f1bf27bc3bf70f64657658635e66094edbcb4d", + NewBranch: "feature/test3", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "repo.branch.create_success", "feature/test3"), + }, + { + OldBranchOrCommit: "master", + NewBranch: "v1.0.0", + CreateRelease: "v1.0.0", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "repo.branch.tag_collision", "v1.0.0"), + }, + { + OldBranchOrCommit: "v1.0.0", + NewBranch: "feature/test4", + CreateRelease: "v1.0.0", + ExpectedStatus: http.StatusFound, + FlashMessage: i18n.Tr("en", "repo.branch.create_success", "feature/test4"), + }, + } + for _, test := range tests { + prepareTestEnv(t) + session := loginUser(t, "user2") + if test.CreateRelease != "" { + createNewRelease(t, session, "/user2/repo1", test.CreateRelease, test.CreateRelease, false, false) + } + redirectURL := testCreateBranch(t, session, "user2", "repo1", test.OldBranchOrCommit, test.NewBranch, test.ExpectedStatus) + if test.ExpectedStatus == http.StatusFound { + req := NewRequest(t, "GET", redirectURL) + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + assert.Equal(t, + test.FlashMessage, + strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), + ) + } + } +} + +func TestCreateBranchInvalidCSRF(t *testing.T) { + prepareTestEnv(t) + session := loginUser(t, "user2") + req := NewRequestWithValues(t, "POST", "user2/repo1/branches/_new/master", map[string]string{ + "_csrf": "fake_csrf", + "new_branch_name": "test", + }) + session.MakeRequest(t, req, http.StatusBadRequest) +} -- cgit v1.2.3