mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
migrate push tests
This commit is contained in:
57
pkg/integration/tests/sync/push.go
Normal file
57
pkg/integration/tests/sync/push.go
Normal file
@ -0,0 +1,57 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var Push = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push a commit to a pre-configured upstream",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.SetBranchUpstream("master", "origin/master")
|
||||
|
||||
shell.EmptyCommit("two")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Status().Content(Contains("↑1 repo → master"))
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
assertSuccessfullyPushed(t)
|
||||
},
|
||||
})
|
||||
|
||||
func assertSuccessfullyPushed(t *TestDriver) {
|
||||
t.Views().Status().Content(Contains("✓ repo → master"))
|
||||
|
||||
t.Views().Remotes().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("origin"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().RemoteBranches().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("master"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().SubCommits().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("two"),
|
||||
Contains("one"),
|
||||
)
|
||||
}
|
33
pkg/integration/tests/sync/push_and_auto_set_upstream.go
Normal file
33
pkg/integration/tests/sync/push_and_auto_set_upstream.go
Normal file
@ -0,0 +1,33 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var PushAndAutoSetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push a commit and set the upstream automatically as configured by git",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.EmptyCommit("two")
|
||||
|
||||
shell.SetConfig("push.default", "current")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
// assert no mention of upstream/downstream changes
|
||||
t.Views().Status().Content(MatchesRegexp(`^\s+repo → master`))
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
assertSuccessfullyPushed(t)
|
||||
},
|
||||
})
|
35
pkg/integration/tests/sync/push_and_set_upstream.go
Normal file
35
pkg/integration/tests/sync/push_and_set_upstream.go
Normal file
@ -0,0 +1,35 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var PushAndSetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push a commit and set the upstream via a prompt",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.EmptyCommit("two")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
// assert no mention of upstream/downstream changes
|
||||
t.Views().Status().Content(MatchesRegexp(`^\s+repo → master`))
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
t.ExpectPopup().Prompt().
|
||||
Title(Equals("Enter upstream as '<remote> <branchname>'")).
|
||||
SuggestionLines(Equals("origin master")).
|
||||
ConfirmFirstSuggestion()
|
||||
|
||||
assertSuccessfullyPushed(t)
|
||||
},
|
||||
})
|
56
pkg/integration/tests/sync/push_follow_tags.go
Normal file
56
pkg/integration/tests/sync/push_follow_tags.go
Normal file
@ -0,0 +1,56 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var PushFollowTags = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push with --follow-tags configured in git config",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.SetBranchUpstream("master", "origin/master")
|
||||
|
||||
shell.EmptyCommit("two")
|
||||
shell.CreateAnnotatedTag("mytag", "message", "HEAD")
|
||||
|
||||
shell.SetConfig("push.followTags", "true")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Status().Content(Contains("↑1 repo → master"))
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
t.Views().Status().Content(Contains("✓ repo → master"))
|
||||
|
||||
t.Views().Remotes().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("origin"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().RemoteBranches().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("master"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().SubCommits().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("two").Contains("mytag"),
|
||||
Contains("one"),
|
||||
)
|
||||
},
|
||||
})
|
55
pkg/integration/tests/sync/push_no_follow_tags.go
Normal file
55
pkg/integration/tests/sync/push_no_follow_tags.go
Normal file
@ -0,0 +1,55 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var PushNoFollowTags = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push with --follow-tags NOT configured in git config",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: true, // turns out this actually DOES push the tag. I have no idea why
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
shell.EmptyCommit("two")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.SetBranchUpstream("master", "origin/master")
|
||||
|
||||
shell.CreateAnnotatedTag("mytag", "message", "HEAD")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Status().Content(Contains("✓ repo → master"))
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
t.Views().Status().Content(Contains("✓ repo → master"))
|
||||
|
||||
t.Views().Remotes().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("origin"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().RemoteBranches().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("master"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().SubCommits().
|
||||
IsFocused().
|
||||
Lines(
|
||||
// tag was not pushed to upstream
|
||||
Contains("two").DoesNotContain("mytag"),
|
||||
Contains("one"),
|
||||
)
|
||||
},
|
||||
})
|
59
pkg/integration/tests/sync/push_tag.go
Normal file
59
pkg/integration/tests/sync/push_tag.go
Normal file
@ -0,0 +1,59 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var PushTag = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push a specific tag",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
shell.EmptyCommit("two")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.CreateAnnotatedTag("mytag", "message", "HEAD")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Tags().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("mytag"),
|
||||
).
|
||||
Press(keys.Branches.PushTag)
|
||||
|
||||
t.ExpectPopup().Prompt().
|
||||
Title(Equals("remote to push tag 'mytag' to:")).
|
||||
InitialText(Equals("origin")).
|
||||
SuggestionLines(
|
||||
Contains("origin"),
|
||||
).
|
||||
Confirm()
|
||||
|
||||
t.Views().Remotes().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("origin"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().RemoteBranches().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("master"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().SubCommits().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("two").Contains("mytag"),
|
||||
Contains("one"),
|
||||
)
|
||||
},
|
||||
})
|
75
pkg/integration/tests/sync/push_with_credential_prompt.go
Normal file
75
pkg/integration/tests/sync/push_with_credential_prompt.go
Normal file
@ -0,0 +1,75 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var PushWithCredentialPrompt = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Push a commit to a pre-configured upstream, where credentials are required",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("one")
|
||||
|
||||
shell.CloneIntoRemote("origin")
|
||||
|
||||
shell.SetBranchUpstream("master", "origin/master")
|
||||
|
||||
shell.EmptyCommit("two")
|
||||
|
||||
// actually getting a password prompt is tricky: it requires SSH'ing into localhost under a newly created, restricted, user.
|
||||
// This is not easy to do in a cross-platform way, nor is it easy to do in a docker container.
|
||||
// If you can think of a way to do it, please let me know!
|
||||
shell.RunCommand("cp ../../../../../hooks/pre-push .git/hooks/pre-push")
|
||||
shell.RunCommand("chmod +x .git/hooks/pre-push")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Status().Content(Contains("↑1 repo → master"))
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
// correct credentials are: username=username, password=password
|
||||
|
||||
t.ExpectPopup().Prompt().
|
||||
Title(Equals("Username")).
|
||||
Type("username").
|
||||
Confirm()
|
||||
|
||||
// enter incorrect password
|
||||
t.ExpectPopup().Prompt().
|
||||
Title(Equals("Password")).
|
||||
Type("incorrect password").
|
||||
Confirm()
|
||||
|
||||
t.ExpectPopup().Alert().
|
||||
Title(Equals("Error")).
|
||||
Content(Contains("incorrect username/password")).
|
||||
Confirm()
|
||||
|
||||
t.Views().Status().Content(Contains("↑1 repo → master"))
|
||||
|
||||
// try again with correct password
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Press(keys.Universal.Push)
|
||||
|
||||
t.ExpectPopup().Prompt().
|
||||
Title(Equals("Username")).
|
||||
Type("username").
|
||||
Confirm()
|
||||
|
||||
t.ExpectPopup().Prompt().
|
||||
Title(Equals("Password")).
|
||||
Type("password").
|
||||
Confirm()
|
||||
|
||||
t.Views().Status().Content(Contains("✓ repo → master"))
|
||||
|
||||
assertSuccessfullyPushed(t)
|
||||
},
|
||||
})
|
Reference in New Issue
Block a user