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.

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

[SDTEST-1345] Add Datadog RUM integration support for browser tests with cuprite driver #283

Merged
merged 6 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,19 @@ def self.with_timecop_gem(timecop_versions: 0)
end
end

def self.with_cuprite_gem(cuprite_versions: 0, capybara_versions: 3)
Array(cuprite_versions).each do |cuprite_v|
Array(capybara_versions).each do |capybara_v|
appraise "cuprite-#{cuprite_v}-capybara-#{capybara_v}" do
gem "capybara", "~> #{capybara_v}"
gem "cuprite", "~> #{cuprite_v}"

gem "cucumber", "~> 9"
end
end
end
end

major, minor, = RUBY_VERSION.segments

with_minitest_gem
Expand All @@ -179,6 +192,7 @@ with_active_support_gem(versions: 4..7)
with_knapsack_pro_rspec_gem
with_selenium_gem if Gem::Version.new("3.0") <= RUBY_VERSION
with_timecop_gem
with_cuprite_gem if Gem::Version.new("3.0") <= RUBY_VERSION

ruby_runtime = "#{RUBY_ENGINE}-#{major}.#{minor}"

Expand Down
9 changes: 7 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ TEST_METADATA = {
"knapsack_pro-7-rspec-3" => "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby"
},
"selenium" => {
"selenium-4-capybara-3" => "❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ❌ 3.4 / ✅ jruby"
"selenium-4-capybara-3" => "❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby"
},
"cuprite" => {
"cuprite-0-capybara-3" => "❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby"
},
"timecop" => {
"timecop-0" => "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby"
Expand Down Expand Up @@ -151,7 +154,9 @@ namespace :spec do
ci_queue_rspec
knapsack_rspec
knapsack_auto_instrument
selenium timecop
selenium
timecop
cuprite
].each do |contrib|
desc "" # "Explicitly hiding from `rake -T`"
RSpec::Core::RakeTask.new(contrib) do |t, args|
Expand Down
1 change: 1 addition & 0 deletions Steepfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ target :lib do
library "timecop"
library "webmock"
library "simplecov"
library "cuprite"
end
28 changes: 28 additions & 0 deletions gemfiles/jruby_9.4_cuprite_0_capybara_3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rake-compiler"
gem "simplecov"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "appraisal"
gem "climate_control"
gem "webmock"
gem "rake"
gem "yard"
gem "os"
gem "capybara", "~> 3"
gem "cuprite", "~> 0"
gem "cucumber", "~> 9"

group :check do

end

group :development do

end

gemspec path: "../"
157 changes: 157 additions & 0 deletions gemfiles/jruby_9.4_cuprite_0_capybara_3.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
PATH
remote: ..
specs:
datadog-ci (1.11.0)
datadog (~> 2.4)
msgpack

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
base64 (0.2.0)
bigdecimal (3.1.9-java)
builder (3.3.0)
capybara (3.40.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.11)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
climate_control (1.2.0)
concurrent-ruby (1.3.5)
crack (1.0.0)
bigdecimal
rexml
cucumber (9.2.1)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 13, < 14)
cucumber-cucumber-expressions (~> 17.0)
cucumber-gherkin (> 24, < 28)
cucumber-html-formatter (> 20.3, < 22)
cucumber-messages (> 19, < 25)
diff-lcs (~> 1.5)
mini_mime (~> 1.1)
multi_test (~> 1.1)
sys-uname (~> 1.2)
cucumber-ci-environment (10.0.1)
cucumber-core (13.0.3)
cucumber-gherkin (>= 27, < 28)
cucumber-messages (>= 20, < 23)
cucumber-tag-expressions (> 5, < 7)
cucumber-cucumber-expressions (17.1.0)
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.7.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
cucumber-tag-expressions (6.1.1)
cuprite (0.15.1)
capybara (~> 3.0)
ferrum (~> 0.15.0)
datadog (2.9.0)
datadog-ruby_core_source (~> 3.3, >= 3.3.7)
libdatadog (~> 14.3.1.1.0)
libddwaf (~> 1.18.0.0.0)
msgpack
datadog-ruby_core_source (3.3.7)
diff-lcs (1.5.1)
docile (1.4.1)
ferrum (0.15)
addressable (~> 2.5)
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (~> 0.7)
ffi (1.17.1-java)
hashdiff (1.1.2)
libdatadog (14.3.1.1.0)
libddwaf (1.18.0.0.0-java)
ffi (~> 1.0)
matrix (0.4.2)
mini_mime (1.1.5)
msgpack (1.7.5-java)
multi_test (1.1.0)
nokogiri (1.18.2-java)
racc (~> 1.4)
os (1.1.4)
public_suffix (6.0.1)
racc (1.8.1-java)
rack (3.1.8)
rack-test (2.2.0)
rack (>= 1.3)
rake (13.2.1)
rake-compiler (1.2.9)
rake
regexp_parser (2.10.0)
rexml (3.4.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-collection_matchers (1.2.1)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.2)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
sys-uname (1.3.1)
ffi (~> 1.1)
thor (1.3.2)
webmock (3.24.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.9.1)
websocket-driver (0.7.7-java)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.37)

PLATFORMS
universal-java-11

DEPENDENCIES
appraisal
capybara (~> 3)
climate_control
cucumber (~> 9)
cuprite (~> 0)
datadog-ci!
os
rake
rake-compiler
rspec
rspec-collection_matchers
rspec_junit_formatter
simplecov
webmock
yard

BUNDLED WITH
2.3.26
29 changes: 29 additions & 0 deletions gemfiles/ruby_3.0_cuprite_0_capybara_3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "debug"
gem "rake-compiler"
gem "simplecov"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "appraisal"
gem "climate_control"
gem "webmock"
gem "rake"
gem "yard"
gem "os"
gem "capybara", "~> 3"
gem "cuprite", "~> 0"
gem "cucumber", "~> 9"

group :check do

end

group :development do

end

gemspec path: "../"
Loading
Loading