Commit b1793f73 authored by Andrejs Cunskis's avatar Andrejs Cunskis

Merge branch 'acunskis-improve-expectations' into 'master'

E2E: Improve expectation errors for gitlab migration specs

See merge request gitlab-org/gitlab!78521
parents 04de8586 34773c24
...@@ -40,13 +40,13 @@ module QA ...@@ -40,13 +40,13 @@ module QA
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347608' testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347608'
) do ) do
expect_import_finished expect_import_finished
expect(imported_issues.count).to eq(1)
aggregate_failures do aggregate_failures do
expect(imported_issues.count).to eq(1)
expect(imported_issue).to eq(source_issue.reload!) expect(imported_issue).to eq(source_issue.reload!)
expect(imported_comments.count).to eq(1) expect(imported_comments.count).to eq(1)
expect(imported_comments.first[:body]).to include(source_comment[:body]) expect(imported_comments.first&.fetch(:body)).to include(source_comment[:body])
end end
end end
end end
......
...@@ -52,9 +52,9 @@ module QA ...@@ -52,9 +52,9 @@ module QA
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348478' testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348478'
) do ) do
expect_import_finished expect_import_finished
expect(imported_mrs.count).to eq(1)
aggregate_failures do aggregate_failures do
expect(imported_mrs.count).to eq(1)
# TODO: remove custom comparison after member migration is implemented # TODO: remove custom comparison after member migration is implemented
# https://gitlab.com/gitlab-org/gitlab/-/issues/341886 # https://gitlab.com/gitlab-org/gitlab/-/issues/341886
expect(imported_mr.comparable.except(:author)).to eq(source_mr.reload!.comparable.except(:author)) expect(imported_mr.comparable.except(:author)).to eq(source_mr.reload!.comparable.except(:author))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment