Fix tests to match v2-to-v3 API switch and plain mode ANSI stripping

Made-with: Cursor

Author: antonzaytsev

internal/view/issue_test.go

@@ -76,11 +76,7 @@ func TestIssueDetailsRenderInPlainView(t *testing.T) {
 	}
 
 	expected := "🐞 Bug  ✅ Done  ⌛ Sun, 13 Dec 20  👷 Person A  🔑️ TEST-1  💭 0 comments  \U0001F9F5 0 linked\n# This is a test\n⏱️  Sun, 13 Dec 20  🔎 Person Z  🚀 High  📦 BE, FE  🏷️  None  👀 You + 3 watchers\n\n------------------------ Description ------------------------\n\nTest description\n\n\n"
-	if xterm256() {
-		expected += "\x1b[38;5;242mView this issue on Jira: https://test.local/browse/TEST-1\x1b[m"
-	} else {
-		expected += "\x1b[0;90mView this issue on Jira: https://test.local/browse/TEST-1\x1b[0m"
-	}
+	expected += "View this issue on Jira: https://test.local/browse/TEST-1"
 	actual := issue.String()
 
 	assert.NoError(t, issue.renderPlain(&b))
@@ -226,13 +222,8 @@ func TestIssueDetailsWithV2Description(t *testing.T) {
 	assert.NoError(t, issue.renderPlain(&b))
 
 	expected := "🐞 Bug  ✅ Done  ⌛ Sun, 13 Dec 20  👷 Person A  🔑️ TEST-1  💭 3 comments  \U0001F9F5 2 linked\n# This is a test\n⏱️  Sun, 13 Dec 20  🔎 Person Z  🚀 High  📦 BE, FE  🏷️  None  👀 0 watchers\n\n------------------------ Description ------------------------\n\n# Title\n## Subtitle\nThis is a **bold** and _italic_ text with [a link](https://ankit.pl) in between.\n\n\n------------------------ 2 Subtasks ------------------------\n\n\n SUBTASKS\n\n  TEST-2 Subtask 1 • High   • TO DO\n  TEST-3 Subtask 2 • Normal • Done \n\n\n\n------------------------ Linked Issues ------------------------\n\n\n BLOCKS\n\n  TEST-2 Something is broken   • Bug • High   • TO DO\n\n RELATES TO\n\n  TEST-3 Everything is on fire • Bug • Urgent • Done \n\n\n\n------------------------ 3 Comments ------------------------\n\n\n Person C • Wed, 24 Nov 21 • Latest comment\n\nTest comment C\n\n\n\n Person B • Tue, 23 Nov 21\n\nTest comment B\n\n"
-	if xterm256() {
-		expected += "\x1b[38;5;242mUse --comments <limit> with `jira issue view` to load more comments\x1b[m\n\n"
-		expected += "\x1b[38;5;242mView this issue on Jira: https://test.local/browse/TEST-1\x1b[m"
-	} else {
-		expected += "\x1b[0;90mUse --comments <limit> with `jira issue view` to load more comments\x1b[0m\n\n"
-		expected += "\x1b[0;90mView this issue on Jira: https://test.local/browse/TEST-1\x1b[0m"
-	}
+	expected += "Use --comments <limit> with `jira issue view` to load more comments\n\n"
+	expected += "View this issue on Jira: https://test.local/browse/TEST-1"
 	actual := issue.String()
 
 	assert.Equal(t, tui.TextData(expected), tui.TextData(actual))

pkg/jira/delete_test.go

@@ -14,10 +14,10 @@ func TestDeleteIssue(t *testing.T) {
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if unexpectedStatusCode {
-			assert.Equal(t, "/rest/api/2/issue/BAD", r.URL.RequestURI())
+			assert.Equal(t, "/rest/api/3/issue/BAD", r.URL.RequestURI())
 			w.WriteHeader(400)
 		} else {
-			assert.Equal(t, "/rest/api/2/issue/TEST-1", r.URL.RequestURI())
+			assert.Equal(t, "/rest/api/3/issue/TEST-1", r.URL.RequestURI())
 			w.WriteHeader(204)
 		}
 	}))
@@ -36,7 +36,7 @@ func TestDeleteIssue(t *testing.T) {
 
 func TestDeleteIssueWithCascade(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/issue/TEST-1?deleteSubtasks=true", r.URL.RequestURI())
+		assert.Equal(t, "/rest/api/3/issue/TEST-1?deleteSubtasks=true", r.URL.RequestURI())
 		w.WriteHeader(204)
 	}))
 	defer server.Close()

pkg/jira/issue_test.go

@@ -392,7 +392,7 @@ func TestGetIssueLinkTypes(t *testing.T) {
 	var unexpectedStatusCode bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/issueLinkType", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issueLinkType", r.URL.Path)
 
 		if unexpectedStatusCode {
 			w.WriteHeader(400)
@@ -442,7 +442,7 @@ func TestLinkIssue(t *testing.T) {
 	var unexpectedStatusCode bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/issueLink", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issueLink", r.URL.Path)
 		assert.Equal(t, "application/json", r.Header.Get("Accept"))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
 
@@ -469,7 +469,7 @@ func TestUnlinkIssue(t *testing.T) {
 	var unexpectedStatusCode bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/issueLink/123", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issueLink/123", r.URL.Path)
 		assert.Equal(t, http.MethodDelete, r.Method)
 		assert.Equal(t, "application/json", r.Header.Get("Accept"))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
@@ -524,14 +524,14 @@ func TestAddIssueComment(t *testing.T) {
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		assert.Equal(t, "POST", r.Method)
-		assert.Equal(t, "/rest/api/2/issue/TEST-1/comment", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issue/TEST-1/comment", r.URL.Path)
 		assert.Equal(t, "application/json", r.Header.Get("Accept"))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
 
 		actualBody := new(strings.Builder)
 		_, _ = io.Copy(actualBody, r.Body)
 
-		expectedBody := `{"body":"comment","properties":[{"key":"sd.public.comment","value":{"internal":false}}]}`
+		expectedBody := `{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"comment"}]}]},"properties":[{"key":"sd.public.comment","value":{"internal":false}}]}`
 
 		assert.Equal(t, expectedBody, actualBody.String())
 
@@ -559,7 +559,7 @@ func TestAddIssueWorklog(t *testing.T) {
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		assert.Equal(t, "POST", r.Method)
-		assert.Equal(t, "/rest/api/2/issue/TEST-1/worklog", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issue/TEST-1/worklog", r.URL.Path)
 		assert.Equal(t, "application/json", r.Header.Get("Accept"))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
 
@@ -612,7 +612,7 @@ func TestGetField(t *testing.T) {
 	var unexpectedStatusCode bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/field", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/field", r.URL.Path)
 
 		if unexpectedStatusCode {
 			w.WriteHeader(400)
@@ -684,7 +684,7 @@ func TestRemoteLinkIssue(t *testing.T) {
 	var unexpectedStatusCode bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/issue/TEST-1/remotelink", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issue/TEST-1/remotelink", r.URL.Path)
 		assert.Equal(t, http.MethodPost, r.Method)
 		assert.Equal(t, "application/json", r.Header.Get("Accept"))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))

pkg/jira/transition_test.go

@@ -75,7 +75,7 @@ func TestTransition(t *testing.T) {
 	var unexpectedStatusCode bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "/rest/api/2/issue/TEST/transitions", r.URL.Path)
+		assert.Equal(t, "/rest/api/3/issue/TEST/transitions", r.URL.Path)
 		assert.Equal(t, "POST", r.Method)
 		assert.Equal(t, "application/json", r.Header.Get("Accept"))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))