Skip to content

Commit

Permalink
Updated gemfiles and fixed code loading issues.
Browse files Browse the repository at this point in the history
Testing suite for this library was not properly running because of the following issues:
- appraisal gemfiles were outdated and did not reflect later changes in project's Gemfile
- requires in specs did not follow any particular order so many tests were loading code from ddtrace gem

Appraisal gemfiles are regenerated with bundle exec appraisal:update and require is replaced with require_relative where needed.
  • Loading branch information
anmarchenko committed Aug 16, 2023
1 parent d609d7d commit 60bfaca
Show file tree
Hide file tree
Showing 147 changed files with 2,211 additions and 1,903 deletions.
5 changes: 5 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
DD_AGENT_HOST=localhost
DD_API_KEY=00000000000000000000000000000000
DD_METRIC_AGENT_PORT=8125
DD_TRACE_AGENT_PORT=8126
TEST_DDAGENT_VAR_RUN=/var/run/datadog
5 changes: 3 additions & 2 deletions gemfiles/jruby_9.2.21.0_cucumber_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ gem "os"
gem "climate_control"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "rubocop", require: false
gem "standard"
gem "appraisal"
gem "standard", "<= 1.24.3"
gem "yard"
gem "webrick"
gem "cucumber", "~> 3"

group :check do
Expand Down
47 changes: 26 additions & 21 deletions gemfiles/jruby_9.2.21.0_cucumber_3.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ PATH
GEM
remote: https://rubygems.org/
specs:
appraisal (2.4.1)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
ast (2.4.2)
backports (3.24.0)
backports (3.24.1)
builder (3.2.4)
climate_control (1.2.0)
coderay (1.1.3)
Expand All @@ -32,49 +32,51 @@ GEM
cucumber-expressions (6.0.1)
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
ddtrace (1.10.1)
debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
libdatadog (~> 2.0.0.1.0)
libddwaf (~> 1.6.2.0.0)
ddtrace (1.13.1)
debase-ruby_core_source (= 3.2.1)
libdatadog (~> 3.0.0.1.0)
libddwaf (~> 1.9.0.0.0)
msgpack
debase-ruby_core_source (3.2.0)
debase-ruby_core_source (3.2.1)
diff-lcs (1.5.0)
ffi (1.15.5-java)
gherkin (5.1.0)
libdatadog (2.0.0.1.0)
libddwaf (1.6.2.0.0-java)
libdatadog (3.0.0.1.0)
libddwaf (1.9.0.0.1-java)
ffi (~> 1.0)
method_source (1.0.0)
msgpack (1.6.1-java)
msgpack (1.7.2-java)
multi_json (1.15.0)
multi_test (1.1.0)
os (1.1.4)
parallel (1.22.1)
parser (3.2.1.1)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pry (0.14.2-java)
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.7.0)
rexml (3.2.5)
regexp_parser (2.8.1)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.4)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rspec-support (3.12.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.25.0)
Expand All @@ -97,8 +99,10 @@ GEM
standard (1.7.0)
rubocop (= 1.25.0)
rubocop-performance (= 1.13.2)
thor (1.2.1)
thor (1.2.2)
unicode-display_width (2.4.2)
webrick (1.8.1)
yard (0.9.34)

PLATFORMS
universal-java-1.8
Expand All @@ -114,8 +118,9 @@ DEPENDENCIES
rspec
rspec-collection_matchers
rspec_junit_formatter
rubocop
standard
standard (<= 1.24.3)
webrick
yard

BUNDLED WITH
2.3.26
5 changes: 3 additions & 2 deletions gemfiles/jruby_9.2.21.0_cucumber_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ gem "os"
gem "climate_control"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "rubocop", require: false
gem "standard"
gem "appraisal"
gem "standard", "<= 1.24.3"
gem "yard"
gem "webrick"
gem "cucumber", "~> 4"

group :check do
Expand Down
53 changes: 29 additions & 24 deletions gemfiles/jruby_9.2.21.0_cucumber_4.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.7.3)
activesupport (6.1.7.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
appraisal (2.4.1)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
Expand Down Expand Up @@ -53,28 +53,29 @@ GEM
cucumber-core (~> 7.1, >= 7.1.0)
cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
cucumber-messages (~> 12.2, >= 12.2.0)
ddtrace (1.10.1)
debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
libdatadog (~> 2.0.0.1.0)
libddwaf (~> 1.6.2.0.0)
ddtrace (1.13.1)
debase-ruby_core_source (= 3.2.1)
libdatadog (~> 3.0.0.1.0)
libddwaf (~> 1.9.0.0.0)
msgpack
debase-ruby_core_source (3.2.0)
debase-ruby_core_source (3.2.1)
diff-lcs (1.3)
ffi (1.15.5-java)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
libdatadog (2.0.0.1.0)
libddwaf (1.6.2.0.0-java)
libdatadog (3.0.0.1.0)
libddwaf (1.9.0.0.1-java)
ffi (~> 1.0)
method_source (1.0.0)
middleware (0.1.0)
minitest (5.15.0)
msgpack (1.6.1-java)
msgpack (1.7.2-java)
multi_test (0.1.2)
os (1.1.4)
parallel (1.22.1)
parser (3.2.1.1)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
protobuf-cucumber (3.10.8)
activesupport (>= 3.2)
middleware
Expand All @@ -84,25 +85,26 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.7.0)
rexml (3.2.5)
regexp_parser (2.8.1)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.4)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rspec-support (3.12.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.25.0)
Expand All @@ -125,14 +127,16 @@ GEM
standard (1.7.0)
rubocop (= 1.25.0)
rubocop-performance (= 1.13.2)
sys-uname (1.2.2)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.1)
thor (1.2.2)
thread_safe (0.3.6-java)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
zeitwerk (2.6.7)
webrick (1.8.1)
yard (0.9.34)
zeitwerk (2.6.11)

PLATFORMS
universal-java-1.8
Expand All @@ -148,8 +152,9 @@ DEPENDENCIES
rspec
rspec-collection_matchers
rspec_junit_formatter
rubocop
standard
standard (<= 1.24.3)
webrick
yard

BUNDLED WITH
2.3.26
5 changes: 3 additions & 2 deletions gemfiles/jruby_9.2.21.0_cucumber_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ gem "os"
gem "climate_control"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "rubocop", require: false
gem "standard"
gem "appraisal"
gem "standard", "<= 1.24.3"
gem "yard"
gem "webrick"
gem "cucumber", "~> 5"

group :check do
Expand Down
53 changes: 29 additions & 24 deletions gemfiles/jruby_9.2.21.0_cucumber_5.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.7.3)
activesupport (6.1.7.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
appraisal (2.4.1)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
Expand Down Expand Up @@ -53,28 +53,29 @@ GEM
cucumber-core (~> 8.0, >= 8.0.1)
cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
cucumber-messages (~> 13.0, >= 13.0.1)
ddtrace (1.10.1)
debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
libdatadog (~> 2.0.0.1.0)
libddwaf (~> 1.6.2.0.0)
ddtrace (1.13.1)
debase-ruby_core_source (= 3.2.1)
libdatadog (~> 3.0.0.1.0)
libddwaf (~> 1.9.0.0.0)
msgpack
debase-ruby_core_source (3.2.0)
debase-ruby_core_source (3.2.1)
diff-lcs (1.5.0)
ffi (1.15.5-java)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
libdatadog (2.0.0.1.0)
libddwaf (1.6.2.0.0-java)
libdatadog (3.0.0.1.0)
libddwaf (1.9.0.0.1-java)
ffi (~> 1.0)
method_source (1.0.0)
middleware (0.1.0)
minitest (5.15.0)
msgpack (1.6.1-java)
msgpack (1.7.2-java)
multi_test (0.1.2)
os (1.1.4)
parallel (1.22.1)
parser (3.2.1.1)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
protobuf-cucumber (3.10.8)
activesupport (>= 3.2)
middleware
Expand All @@ -84,25 +85,26 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.7.0)
rexml (3.2.5)
regexp_parser (2.8.1)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.4)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rspec-support (3.12.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.25.0)
Expand All @@ -125,14 +127,16 @@ GEM
standard (1.7.0)
rubocop (= 1.25.0)
rubocop-performance (= 1.13.2)
sys-uname (1.2.2)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.1)
thor (1.2.2)
thread_safe (0.3.6-java)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
zeitwerk (2.6.7)
webrick (1.8.1)
yard (0.9.34)
zeitwerk (2.6.11)

PLATFORMS
universal-java-1.8
Expand All @@ -148,8 +152,9 @@ DEPENDENCIES
rspec
rspec-collection_matchers
rspec_junit_formatter
rubocop
standard
standard (<= 1.24.3)
webrick
yard

BUNDLED WITH
2.3.26
Loading

0 comments on commit 60bfaca

Please sign in to comment.