test: Update tests for changes to fixture project

Author: claytonrcarter

cmd/mr_show_test.go

@@ -33,16 +33,16 @@ Branches: mrtest->master
 Status: Open
 Assignee: zaquestion
 Author: zaquestion
-Approved By: None
+Approved By: lab-testing
 Approvers: None
 Approval Groups: None
 Reviewers: None
-Milestone: None
+Milestone: 1.0
 Labels: documentation
 Issues Closed by this MR: 
 Subscribed: Yes
 Created At: 2017-09-19 03:55:51.674 +0000 UTC
-Updated At: 2022-06-24 22:22:06.551 +0000 UTC
+Updated At: 2023-05-25 01:45:54.027 +0000 UTC
 WebURL: https://gitlab.com/zaquestion/test/-/merge_requests/1`)
 	require.Contains(t, string(b), `commented at`)
 	require.Contains(t, string(b), `updated comment at`)

cmd/mr_test.go

@@ -519,18 +519,11 @@ func Test_mrCmd_assign_and_review(t *testing.T) {
 	mrID = s[0]
 	// strip off "!"
 	mrID = mrID[1:]
+	t.Log("mrID:", mrID)
 
 	mrURL := "https://gitlab.com/zaquestion/test/-/merge_requests/" + mrID
 
 	t.Run("assign_and_unassign", func(t *testing.T) {
-		mrEdit := exec.Command(labBinaryPath, "mr", "edit", mrID, "--assign", "lab-testing")
-		mrEdit.Dir = repo
-		mrEditOut, err := mrEdit.CombinedOutput()
-		if err != nil {
-			t.Log(string(mrEditOut))
-			t.Fatal(err)
-		}
-
 		mrList := exec.Command(labBinaryPath, "mr", "list", "--assignee", "lab-testing")
 		mrList.Dir = repo
 		mrListOut, err := mrList.CombinedOutput()
@@ -547,21 +540,21 @@ func Test_mrCmd_assign_and_review(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		require.Contains(t, string(mrEditOut), mrURL)
-		require.Contains(t, string(mrListOut), mrIDString)
-		require.Contains(t, string(mrUnEditOut), mrURL)
-	})
-
-	// This tests 'lab mr edit --review' and 'lab mr list --unreview'
-	t.Run("review_and_unreview", func(t *testing.T) {
-		mrEdit := exec.Command(labBinaryPath, "mr", "edit", mrID, "--review", "lab-testing")
+		mrEdit := exec.Command(labBinaryPath, "mr", "edit", mrID, "--assign", "lab-testing")
 		mrEdit.Dir = repo
 		mrEditOut, err := mrEdit.CombinedOutput()
 		if err != nil {
 			t.Log(string(mrEditOut))
 			t.Fatal(err)
 		}
 
+		require.Contains(t, string(mrEditOut), mrURL)
+		require.Contains(t, string(mrListOut), mrIDString)
+		require.Contains(t, string(mrUnEditOut), mrURL)
+	})
+
+	// This tests 'lab mr edit --review' and 'lab mr list --unreview'
+	t.Run("review_and_unreview", func(t *testing.T) {
 		mrList := exec.Command(labBinaryPath, "mr", "list", "--reviewer", "lab-testing")
 		mrList.Dir = repo
 		mrListOut, err := mrList.CombinedOutput()
@@ -578,6 +571,14 @@ func Test_mrCmd_assign_and_review(t *testing.T) {
 			t.Fatal(err)
 		}
 
+		mrEdit := exec.Command(labBinaryPath, "mr", "edit", mrID, "--review", "lab-testing")
+		mrEdit.Dir = repo
+		mrEditOut, err := mrEdit.CombinedOutput()
+		if err != nil {
+			t.Log(string(mrEditOut))
+			t.Fatal(err)
+		}
+
 		require.Contains(t, string(mrEditOut), mrURL)
 		require.Contains(t, string(mrListOut), mrIDString)
 		require.Contains(t, string(mrUnEditOut), mrURL)