feat(tests): run against ssh ui

charmbracelet · Dec 7, 2023 · 7e2f1d6 · 7e2f1d6
1 parent 1a834e4
commit 7e2f1d6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 122 deletions.
diff --git a/cmd/soft/main.go b/cmd/soft/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"runtime/debug"
+	"strconv"
 
 	"github.com/charmbracelet/log"
 	"github.com/charmbracelet/soft-serve/cmd/soft/admin"
@@ -13,9 +14,11 @@ import (
 	"github.com/charmbracelet/soft-serve/cmd/soft/serve"
 	"github.com/charmbracelet/soft-serve/pkg/config"
 	logr "github.com/charmbracelet/soft-serve/pkg/log"
+	"github.com/charmbracelet/soft-serve/pkg/ui/common"
 	"github.com/charmbracelet/soft-serve/pkg/version"
 	mcobra "github.com/muesli/mango-cobra"
 	"github.com/muesli/roff"
+	"github.com/muesli/termenv"
 	"github.com/spf13/cobra"
 	"go.uber.org/automaxprocs/maxprocs"
 )
@@ -63,6 +66,10 @@ var (
 )
 
 func init() {
+	if noColor, _ := strconv.ParseBool(os.Getenv("SOFT_SERVE_NO_COLOR")); noColor {
+		common.DefaultColorProfile = termenv.Ascii
+	}
+
 	rootCmd.AddCommand(
 		manCmd,
 		serve.Command,

diff --git a/testscript/script_test.go b/testscript/script_test.go
@@ -1,7 +1,6 @@
 package testscript
 
 import (
-	"bufio"
 	"bytes"
 	"context"
 	"encoding/json"
@@ -16,11 +15,11 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
 
-	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/keygen"
 	"github.com/charmbracelet/soft-serve/pkg/config"
 	"github.com/charmbracelet/soft-serve/pkg/db"
@@ -124,6 +123,9 @@ func TestScript(t *testing.T) {
 			// This is used to set up test specific configuration and http endpoints
 			e.Setenv("SOFT_SERVE_TESTRUN", "1")
 
+			// This will disable the default lipgloss renderer colors
+			e.Setenv("SOFT_SERVE_NO_COLOR", "1")
+
 			// Soft Serve debug environment variables
 			for _, env := range []string{
 				"SOFT_SERVE_DEBUG",
@@ -206,24 +208,24 @@ func cmdSoft(key ssh.Signer) func(ts *testscript.TestScript, neg bool, args []st
 func cmdUI(key ssh.Signer) func(ts *testscript.TestScript, neg bool, args []string) {
 	return func(ts *testscript.TestScript, neg bool, args []string) {
 		if len(args) < 1 {
-			ts.Fatalf("usage: ui <stdin file>")
+			ts.Fatalf("usage: ui <quoted string input>")
 			return
 		}
 
 		cli, err := ssh.Dial(
 			"tcp",
 			net.JoinHostPort("localhost", ts.Getenv("SSH_PORT")),
 			&ssh.ClientConfig{
-				User:            "admin",
+				User:            "git",
 				Auth:            []ssh.AuthMethod{ssh.PublicKeys(key)},
 				HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 			},
 		)
-		ts.Check(err)
+		check(ts, err, neg)
 		defer cli.Close()
 
 		sess, err := cli.NewSession()
-		ts.Check(err)
+		check(ts, err, neg)
 		defer sess.Close()
 
 		// XXX: this is a hack to make the UI tests work
@@ -235,35 +237,32 @@ func cmdUI(key ssh.Signer) func(ts *testscript.TestScript, neg bool, args []stri
 		sess.Stderr = ts.Stderr()
 
 		stdin, err := sess.StdinPipe()
-		ts.Check(err)
+		check(ts, err, neg)
 
+		in, err := strconv.Unquote(args[0])
+		check(ts, err, neg)
+		reader := strings.NewReader(in)
 		go func() {
 			defer stdin.Close()
-			in := ts.ReadFile(args[0])
-			reader := bufio.NewReader(strings.NewReader(in))
 			for {
 				r, _, err := reader.ReadRune()
 				if err == io.EOF {
 					break
 				}
-				ts.Check(err)
-				stdin.Write([]byte{byte(r)}) // nolint: errcheck
+				check(ts, err, neg)
+				stdin.Write([]byte(string(r))) // nolint: errcheck
+
 				// Wait for the UI to process the input
-				<-time.After(100 * time.Millisecond)
+				time.Sleep(100 * time.Millisecond)
 			}
 		}()
 
-		err = sess.RequestPty("xterm-256color", 40, 80, ssh.TerminalModes{})
-		ts.Check(err)
-
+		err = sess.RequestPty("dumb", 40, 80, ssh.TerminalModes{})
+		check(ts, err, neg)
 		check(ts, sess.Run(""), neg)
 	}
 }
 
-var keyToRune = map[string]rune{
-	"esc": rune(tea.KeyEscape),
-}
-
 // P.S. Windows sucks!
 func cmdDos2Unix(ts *testscript.TestScript, neg bool, args []string) {
 	if neg {

diff --git a/testscript/testdata/repo-blob.txtar b/testscript/testdata/repo-blob.txtar
@@ -54,6 +54,6 @@ stderr 'revision does not exist'
 -- blob1.txt --
 # Hello\n\nwelcome
 -- blob2.txt --
- [38;5;239m1[0m [38;5;236m│[0m [38;5;204m[0m[38;5;204mpackage[0m main[38;5;255m\[0mnconst foo [38;5;187m=[0m [38;5;85m2[0m[38;5;255m\[0mn
+ 1 │ package main\nconst foo = 2\n
 -- blob3.txt --
  1 │ //#include <stdio.h>
diff --git a/testscript/testdata/ui-home.txtar b/testscript/testdata/ui-home.txtar
@@ -3,12 +3,17 @@
 # convert crlf to lf on windows
 [windows] dos2unix home-in.txt home.txt about-in.txt about.txt
 
+# start soft serve
+exec soft serve &
+# wait for server to start
+waitforserver
+
 # test repositories tab
-ui home-in.txt
+ui '"    q"'
 cmp stdout home.txt
 
 # test about tab
-ui about-in.txt
+ui '"\t    q"'
 cmp stdout about.txt
 
 # add a new repo
@@ -28,39 +33,31 @@ git -C config commit -m 'Initial commit'
 git -C config push origin HEAD
 
 # test repositories tab
-ui home-in.txt
-cmpenv stdout home2.txt
+ui '"    q"'
+cp stdout home2.txt
+grep 'Config' home2.txt
+grep 'Test Soft Serve' home2.txt
+grep 'git clone ssh://localhost:.*/.soft-serve' home2.txt
 
 # test about tab
-ui about-in.txt
-cmp stdout about2.txt
+ui '"\t      q"'
+cp stdout about2.txt
+grep '• About' about2.txt
+grep 'Hello World' about2.txt
+grep 'Test Soft Serve' about2.txt
+
+# stop the server
+[windows] stopserver
+[windows] ! stderr .
 
--- home-in.txt --
-    q
 -- home.txt --
 [?25l[?1049h[2J[1;1H[1;1H[?25l[?1002h                                                                                
-   [48;5;57m [0m[1;38;5;229;48;5;57mTest Soft Serve[0m[48;5;57m [0m                                                            
-
-  [38;5;36m• [0m[38;5;36mRepositories[0m    About                                                       
-
-    [38;5;242mNo items found.[0m                                                             
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    Test Soft Serve                                                             
 
+  • Repositories    About                                                       
 
 
+    No items found.                                                             
 
 
 
@@ -71,31 +68,6 @@ cmp stdout about2.txt
 
 
 
-
-
-
-
-
-   [38;5;241m↑↓[0m [38;5;239mnavigate[0m[38;5;59m • [0m[38;5;241mtab[0m [38;5;239msection[0m[38;5;59m • [0m[38;5;241menter[0m [38;5;239mselect[0m[38;5;59m • [0m[38;5;241m/[0m [38;5;239mfilter[0m[38;5;59m • [0m[38;5;241mesc[0m [38;5;239mclear filter[0m [38;5;59m…[0m     
-                                                                                [40;0H[2K[?25h[?1002l[?1003l[?1049l[?25h
--- home2.txt --
-[?25l[?1049h[2J[1;1H[1;1H[?25l[?1002h                                                                                
-   [48;5;57m [0m[1;38;5;229;48;5;57mTest Soft Serve[0m[48;5;57m [0m                                                            
-
-  [38;5;36m• [0m[38;5;36mRepositories[0m    About                                                       
-
-  [38;5;176m┃[0m [1;38;5;212mConfig [0m                                                       [38;5;212m Updated now[0m  
-  [38;5;176m┃[0m [38;5;246mTest Soft Serve[0m                                                             
-  [38;5;176m┃[0m [38;5;204mgit clone ssh://localhost:$SSH_PORT/.soft-serve.git[0m                             
-
-
-
-
-
-
-
-
-
 
 
 
@@ -117,60 +89,17 @@ cmp stdout about2.txt
 
 
 
-   [38;5;241m↑↓[0m [38;5;239mnavigate[0m[38;5;59m • [0m[38;5;241mtab[0m [38;5;239msection[0m[38;5;59m • [0m[38;5;241menter[0m [38;5;239mselect[0m[38;5;59m • [0m[38;5;241m/[0m [38;5;239mfilter[0m[38;5;59m • [0m[38;5;241mc[0m [38;5;239mcopy command[0m [38;5;59m…[0m       
+   ↑↓ navigate • tab section • enter select • c copy command • q quit …         
                                                                                 [40;0H[2K[?25h[?1002l[?1003l[?1049l[?25h
--- about-in.txt --
-	    q
 -- about.txt --
 [?25l[?1049h[2J[1;1H[1;1H[?25l[?1002h                                                                                
-   [48;5;57m [0m[1;38;5;229;48;5;57mTest Soft Serve[0m[48;5;57m [0m                                                            
-
-    Repositories  [38;5;36m• [0m[38;5;36mAbout[0m                                                       
-
-    [38;5;242mNo readme found.[0m                                                            
-    [38;5;242m[0m                                                                            
-    [38;5;242mCreate a `.soft-serve` repository and add a `README.md` file to display re[0m  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                                                        [38;5;241m☰ 100%[0m  
-
-   [38;5;241m↑↓[0m [38;5;239mnavigate[0m[38;5;59m • [0m[38;5;241mtab[0m [38;5;239msection[0m[38;5;59m • [0m[38;5;241mq[0m [38;5;239mquit[0m[38;5;59m • [0m[38;5;241m?[0m [38;5;239mtoggle help[0m                           
-                                                                                [40;0H[2K[?25h[?1002l[?1003l[?1049l[?25h
--- about2.txt --
-[?25l[?1049h[2J[1;1H[1;1H[?25l[?1002h                                                                                
-   [48;5;57m [0m[1;38;5;229;48;5;57mTest Soft Serve[0m[48;5;57m [0m                                                            
-
-    Repositories  [38;5;36m• [0m[38;5;36mAbout[0m                                                       
+    Test Soft Serve                                                             
 
-  [38;5;39;1m[0m[38;5;39;1m[0m  [38;5;39;1m# [0m[38;5;39;1mHello World\nTest Soft[0m[38;5;39;1m Serve[0m                                              
+    Repositories  • About                                                       
 
+    No readme found.                                                            
 
+    Create a `.soft-serve` repository and add a `README.md` file to display re  
 
 
 
@@ -199,7 +128,7 @@ cmp stdout about2.txt
 
 
 
-                                                                        [38;5;241m☰ 100%[0m  
+                                                                        ☰ 100%  
 
-   [38;5;241m↑↓[0m [38;5;239mnavigate[0m[38;5;59m • [0m[38;5;241mtab[0m [38;5;239msection[0m[38;5;59m • [0m[38;5;241mq[0m [38;5;239mquit[0m[38;5;59m • [0m[38;5;241m?[0m [38;5;239mtoggle help[0m                           
+   ↑↓ navigate • tab section • q quit • ? toggle help                           
                                                                                 [40;0H[2K[?25h[?1002l[?1003l[?1049l[?25h