mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
63dc07fded
By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there
75 lines
1.9 KiB
Go
75 lines
1.9 KiB
Go
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: []string{},
|
|
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.CopyHelpFile("pre-push", ".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)
|
|
},
|
|
})
|