pagure

Clone

#4520 Fix git terminology on rebase commits
Closed 4 years ago by jlanda. Opened 4 years ago by jlanda.
jlanda/pagure fix-rebased-onto  into  master

file modified
+1 -1 
@@ -2226,7 +2226,7 @@ 
 

                  and request.commit_start != first_commit.oid.hex
 

              ):
 

                  pr_action = "rebased"
 

-                 commenttext = "rebased onto %s" % first_commit.oid.hex
 

+                 commenttext = "rebased as %s" % first_commit.oid.hex
 

          request.commit_start = first_commit.oid.hex
 

          request.commit_stop = diff_commits[0].oid.hex
 

          session.add(request)

file modified
+2 -2 
@@ -206,7 +206,7 @@ 
 

              output = self.app.get("/test/pull-request/1")
 

              self.assertEqual(output.status_code, 200)
 

              output_text = output.get_data(as_text=True)
 

-             self.assertIn("rebased onto", output_text)
 

+             self.assertIn("rebased as", output_text)
 

              repo = pagure.lib.query._get_project(self.session, "test")
 

              self.assertEqual(
 

                  repo.requests[0].comments[0].user.username, "pingou"
 
@@ -263,7 +263,7 @@ 
 

              output = self.app.get("/test/pull-request/1")
 

              self.assertEqual(output.status_code, 200)
 

              output_text = output.get_data(as_text=True)
 

-             self.assertIn("rebased onto", output_text)
 

+             self.assertIn("rebased as", output_text)
 

              repo = pagure.lib.query._get_project(self.session, "test")
 

              self.assertEqual(repo.requests[0].comments[0].user.username, "foo")

Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.