Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: use rspec matchers to simplify specs #121

Merged
merged 10 commits into from
Feb 13, 2024
Merged

backport: use rspec matchers to simplify specs #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7085978
rename ConfigurationHelpers to GemsHelpers, simplify setup
anmarchenko Jan 30, 2024
d9aa720
move ci mode and concurrency test to contexts folder
anmarchenko Jan 30, 2024
1dbdae4
move git fixture to contexts
anmarchenko Jan 30, 2024
d9ecd78
remove log_helpers as they are not used
anmarchenko Jan 30, 2024
1cb2f01
remove PlatformHelpers
anmarchenko Jan 30, 2024
73cf1ad
rename provider_test_helpers to extract_environment_tags shared context
anmarchenko Jan 30, 2024
a929703
move "citestcycle serializer" shared context to contexts folder
anmarchenko Jan 30, 2024
2d4d6f4
rename and reorganize some tracer_helpers; better specs for boolean m…
anmarchenko Jan 30, 2024
b7a4dde
remove unused span helpers
anmarchenko Jan 30, 2024
a18860c
add more rspec matchers to span_helpers and greatly simplify tracing …
anmarchenko Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions spec/datadog/ci/contrib/ci_queue_minitest/instrumentation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,13 @@
expect(test_module_span).not_to be_nil

# test session and module are failed
expect(test_session_span.get_tag(Datadog::CI::Ext::Test::TAG_STATUS)).to eq(
Datadog::CI::Ext::Test::Status::FAIL
)
expect(test_module_span.get_tag(Datadog::CI::Ext::Test::TAG_STATUS)).to eq(
Datadog::CI::Ext::Test::Status::FAIL
)
expect([test_session_span, test_module_span]).to all have_fail_status

# test suite spans are created for each test as for parallel execution
expect(test_suite_spans).to have(3).items
expect(test_suite_spans.map { |span| span.get_tag(Datadog::CI::Ext::Test::TAG_STATUS) }.sort).to eq(
[Datadog::CI::Ext::Test::Status::FAIL, Datadog::CI::Ext::Test::Status::PASS, Datadog::CI::Ext::Test::Status::PASS]
)
expect(test_suite_spans.map { |span| span.get_tag(Datadog::CI::Ext::Test::TAG_SUITE) }.sort).to eq(
expect(test_suite_spans).to have_tag_values_no_order(:status, ["pass", "pass", "fail"])
expect(test_suite_spans).to have_tag_values_no_order(
:suite,
[
"SomeTest at spec/datadog/ci/contrib/ci_queue_minitest/fake_test.rb (test_fail concurrently)",
"SomeTest at spec/datadog/ci/contrib/ci_queue_minitest/fake_test.rb (test_pass concurrently)",
Expand All @@ -63,13 +57,10 @@
# there is test span for every test case
expect(test_spans).to have(3).items
# each test span has its own test suite
expect(test_spans.map { |span| span.get_tag(Datadog::CI::Ext::Test::TAG_TEST_SUITE_ID) }.uniq).to have(3).items
expect(test_spans).to have_unique_tag_values_count(:test_suite_id, 3)

# every test span is connected to test module and test session
test_spans.each do |test_span|
[Datadog::CI::Ext::Test::TAG_TEST_MODULE_ID, Datadog::CI::Ext::Test::TAG_TEST_SESSION_ID].each do |tag|
expect(test_span.get_tag(tag)).not_to be_nil
end
end
expect(test_spans).to all have_test_tag(:test_module_id)
expect(test_spans).to all have_test_tag(:test_session_id)
end
end
22 changes: 8 additions & 14 deletions spec/datadog/ci/contrib/ci_queue_rspec/instrumentation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,16 @@ def with_new_rspec_environment
expect(test_module_span).not_to be_nil

# test session and module are failed
expect(test_session_span.get_tag(Datadog::CI::Ext::Test::TAG_STATUS)).to eq(
Datadog::CI::Ext::Test::Status::FAIL
)
expect(test_module_span.get_tag(Datadog::CI::Ext::Test::TAG_STATUS)).to eq(
Datadog::CI::Ext::Test::Status::FAIL
)
expect([test_session_span, test_module_span]).to all have_fail_status

# test suite spans are created for each test as for parallel execution
expect(test_suite_spans).to have(2).items
expect(test_suite_spans.map { |span| span.get_tag(Datadog::CI::Ext::Test::TAG_STATUS) }.sort).to eq(
expect(test_suite_spans).to have_tag_values_no_order(
:status,
[Datadog::CI::Ext::Test::Status::FAIL, Datadog::CI::Ext::Test::Status::PASS]
)
expect(test_suite_spans.map { |span| span.get_tag(Datadog::CI::Ext::Test::TAG_SUITE) }.sort).to eq(
expect(test_suite_spans).to have_tag_values_no_order(
:suite,
[
"SomeTest at ./spec/datadog/ci/contrib/ci_queue_rspec/suite_under_test/some_test_rspec.rb (ci-queue running example [nested fails])",
"SomeTest at ./spec/datadog/ci/contrib/ci_queue_rspec/suite_under_test/some_test_rspec.rb (ci-queue running example [nested foo])"
Expand All @@ -81,13 +78,10 @@ def with_new_rspec_environment
# there is test span for every test case
expect(test_spans).to have(2).items
# each test span has its own test suite
expect(test_spans.map { |span| span.get_tag(Datadog::CI::Ext::Test::TAG_TEST_SUITE_ID) }.uniq).to have(2).items
expect(test_spans).to have_unique_tag_values_count(:test_suite_id, 2)

# every test span is connected to test module and test session
test_spans.each do |test_span|
[Datadog::CI::Ext::Test::TAG_TEST_MODULE_ID, Datadog::CI::Ext::Test::TAG_TEST_SESSION_ID].each do |tag|
expect(test_span.get_tag(tag)).not_to be_nil
end
end
expect(test_spans).to all have_test_tag(:test_module_id)
expect(test_spans).to all have_test_tag(:test_session_id)
end
end
Loading
Loading