Skip to content

Commit 5fd877d

Browse files
committed
➕ Add webmock & vcr directly for CI
1 parent cb2965b commit 5fd877d

File tree

5 files changed

+31
-10
lines changed

5 files changed

+31
-10
lines changed

.idea/oauth2.iml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gemfile.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ GEM
4141
bundler (>= 1.2.0, < 3)
4242
thor (~> 1.0)
4343
concurrent-ruby (1.3.5)
44+
crack (1.0.0)
45+
bigdecimal
46+
rexml
4447
date (3.4.1)
4548
debug (1.11.0)
4649
irb (~> 1.10)
@@ -90,6 +93,7 @@ GEM
9093
version_gem (~> 1.1, >= 1.1.4)
9194
gitmoji-regex (1.0.3)
9295
version_gem (~> 1.1, >= 1.1.8)
96+
hashdiff (1.2.1)
9397
hashie (5.0.0)
9498
io-console (0.8.1)
9599
irb (1.15.2)
@@ -305,7 +309,13 @@ GEM
305309
unicode-emoji (~> 4.0, >= 4.0.4)
306310
unicode-emoji (4.0.4)
307311
uri (1.0.3)
312+
vcr (6.3.1)
313+
base64
308314
version_gem (1.1.9)
315+
webmock (3.25.1)
316+
addressable (>= 2.8.0)
317+
crack (>= 0.3.2)
318+
hashdiff (>= 0.4.0, < 2.0.0)
309319
yard (0.9.37)
310320
yard-relative_markdown_links (0.5.0)
311321
nokogiri (>= 1.14.3, < 2)
@@ -349,6 +359,8 @@ DEPENDENCIES
349359
standard (>= 1.50)
350360
stone_checksums (~> 1.0, >= 1.0.2)
351361
stringio (>= 3.0)
362+
vcr (>= 4)
363+
webmock (>= 3)
352364
yard (~> 0.9, >= 0.9.37)
353365
yard-junk (~> 0.0, >= 0.0.10)!
354366
yard-relative_markdown_links (~> 0.5.0)

oauth2.gemspec

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ Thanks, @pboling / @galtzo
149149
# and preferably a modular one (see gemfiles/modular/*.gemfile).
150150

151151
spec.add_development_dependency("addressable", "~> 2.8", ">= 2.8.7") # ruby >= 2.2
152-
spec.add_development_dependency("backports", "~> 3.25", ">= 3.25.1") # ruby >= 0
153152
spec.add_development_dependency("nkf", "~> 0.2") # ruby >= 2.3
154153
spec.add_development_dependency("rexml", "~> 3.2", ">= 3.2.5") # ruby >= 0
155154

@@ -187,9 +186,7 @@ Thanks, @pboling / @galtzo
187186
spec.add_development_dependency("gitmoji-regex", "~> 1.0", ">= 1.0.3") # ruby >= 2.3.0
188187

189188
# HTTP recording for deterministic specs
190-
# It seems that somehow just having a newer version of appraisal installed breaks
191-
# Ruby 2.3 and 2.4 even if their bundle specifies an older version,
192-
# and as a result it can only be a dependency in the appraisals.
189+
# Ruby 2.3 / 2.4 can fail with:
193190
# | An error occurred while loading spec_helper.
194191
# | Failure/Error: require "vcr"
195192
# |
@@ -199,6 +196,8 @@ Thanks, @pboling / @galtzo
199196
# | # ./spec/config/vcr.rb:3:in `<top (required)>'
200197
# | # ./spec/spec_helper.rb:8:in `require_relative'
201198
# | # ./spec/spec_helper.rb:8:in `<top (required)>'
202-
# spec.add_development_dependency("vcr", ">= 4") # 6.0 claims to support ruby >= 2.3, but fails on ruby 2.4
203-
# spec.add_development_dependency("webmock", ">= 3") # Last version to support ruby >= 2.3
199+
# So that's why we need backports.
200+
spec.add_development_dependency("backports", "~> 3.25", ">= 3.25.1") # ruby >= 0
201+
spec.add_development_dependency("vcr", ">= 4") # 6.0 claims to support ruby >= 2.3, but fails on ruby 2.4
202+
spec.add_development_dependency("webmock", ">= 3") # Last version to support ruby >= 2.3
204203
end

spec/spec_helper.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
# ensure test env
44
ENV["RACK_ENV"] = "test"
55

6-
# Third Party Libraries
6+
# Global Extensions
7+
require_relative "ext/backports"
8+
9+
# External libraries
710
require "addressable/uri"
811
require "rspec/pending_for"
912

1013
# Family libraries
1114
require "kettle/test/rspec"
1215

13-
# Extensions
14-
require_relative "ext/backports"
15-
1616
# Library Configs
1717
require_relative "config/debug"
1818
require_relative "config/multi_xml"

0 commit comments

Comments
 (0)