diff options
Diffstat (limited to 'integrations')
5 files changed, 2 insertions, 1 deletions
diff --git a/integrations/gitea-repositories-meta/user13/repo11.git/objects/0a/bcb056019adb8336cf9db3ad9d9cf80cd4b141 b/integrations/gitea-repositories-meta/user13/repo11.git/objects/0a/bcb056019adb8336cf9db3ad9d9cf80cd4b141 Binary files differnew file mode 100644 index 0000000000..63ba4ed8ee --- /dev/null +++ b/integrations/gitea-repositories-meta/user13/repo11.git/objects/0a/bcb056019adb8336cf9db3ad9d9cf80cd4b141 diff --git a/integrations/gitea-repositories-meta/user13/repo11.git/objects/75/d1afd00e111c8dbd9e3d96a27b431ac5ae6d74 b/integrations/gitea-repositories-meta/user13/repo11.git/objects/75/d1afd00e111c8dbd9e3d96a27b431ac5ae6d74 Binary files differnew file mode 100644 index 0000000000..609b1c0e64 --- /dev/null +++ b/integrations/gitea-repositories-meta/user13/repo11.git/objects/75/d1afd00e111c8dbd9e3d96a27b431ac5ae6d74 diff --git a/integrations/gitea-repositories-meta/user13/repo11.git/objects/ed/447543e0c85d628b91f7f466f4921908f4c5ea b/integrations/gitea-repositories-meta/user13/repo11.git/objects/ed/447543e0c85d628b91f7f466f4921908f4c5ea Binary files differnew file mode 100644 index 0000000000..b3a1046fee --- /dev/null +++ b/integrations/gitea-repositories-meta/user13/repo11.git/objects/ed/447543e0c85d628b91f7f466f4921908f4c5ea diff --git a/integrations/gitea-repositories-meta/user13/repo11.git/refs/heads/branch2 b/integrations/gitea-repositories-meta/user13/repo11.git/refs/heads/branch2 new file mode 100644 index 0000000000..d413449668 --- /dev/null +++ b/integrations/gitea-repositories-meta/user13/repo11.git/refs/heads/branch2 @@ -0,0 +1 @@ +0abcb056019adb8336cf9db3ad9d9cf80cd4b141 diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index 1f0ad27a0b..4266a194eb 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -159,7 +159,7 @@ func TestCantMergeWorkInProgress(t *testing.T) { req := NewRequest(t, "GET", resp.Header().Get("Location")) resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - text := strings.TrimSpace(htmlDoc.doc.Find(".merge.segment > .text.grey").Text()) + text := strings.TrimSpace(htmlDoc.doc.Find(".merge-section.segment > .text.grey").Text()) assert.NotEmpty(t, text, "Can't find WIP text") // remove <strong /> from lang |