Skip to content

Commit baa0cdf

Browse files
committed
Update supported Rails and Ruby versions
Includes removing Timecop, since Rails now has what we need.
1 parent 0dacf8c commit baa0cdf

File tree

5 files changed

+18
-20
lines changed

5 files changed

+18
-20
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require: rubocop-rails
55
AllCops:
66
DisplayCopNames: true
77
DisplayStyleGuide: true
8-
TargetRubyVersion: 2.3
8+
TargetRubyVersion: 2.5
99
Exclude:
1010
- "bin/*"
1111
- Capfile

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ group :test do
2020
gem "equivalent-xml"
2121
gem "mocha"
2222
gem "sqlite3"
23-
gem "timecop", "~> 0.7.1"
2423
end

bootstrap_form.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
2424
s.bindir = "exe"
2525
s.require_paths = ["lib"]
2626

27-
s.required_ruby_version = ">= 2.3"
27+
s.required_ruby_version = ">= 2.5"
2828

29-
s.add_dependency("actionpack", ">= 5.0")
30-
s.add_dependency("activemodel", ">= 5.0")
29+
s.add_dependency("actionpack", ">= 5.2")
30+
s.add_dependency("activemodel", ">= 5.2")
3131
end

test/bootstrap_selects_test.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
294294
end
295295

296296
test "date selects are wrapped correctly" do
297-
Timecop.freeze(Time.utc(2012, 2, 3)) do
297+
travel_to(Time.utc(2012, 2, 3)) do
298298
expected = <<-HTML.strip_heredoc
299299
<div class="form-group">
300300
<label for="user_misc">Misc</label>
@@ -316,7 +316,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
316316
end
317317

318318
test "date selects are wrapped correctly with wrapper class" do
319-
Timecop.freeze(Time.utc(2012, 2, 3)) do
319+
travel_to(Time.utc(2012, 2, 3)) do
320320
expected = <<-HTML.strip_heredoc
321321
<div class="form-group none-margin">
322322
<label for="user_misc">Misc</label>
@@ -338,7 +338,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
338338
end
339339

340340
test "date selects inline when layout is horizontal" do
341-
Timecop.freeze(Time.utc(2012, 2, 3)) do
341+
travel_to(Time.utc(2012, 2, 3)) do
342342
expected = <<-HTML.strip_heredoc
343343
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
344344
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -366,7 +366,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
366366

367367
test "date selects are wrapped correctly with error" do
368368
@user.errors.add(:misc, "error for test")
369-
Timecop.freeze(Time.utc(2012, 2, 3)) do
369+
travel_to(Time.utc(2012, 2, 3)) do
370370
expected = <<-HTML.strip_heredoc
371371
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
372372
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -392,7 +392,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
392392
end
393393

394394
test "date selects with options are wrapped correctly" do
395-
Timecop.freeze(Time.utc(2012, 2, 3)) do
395+
travel_to(Time.utc(2012, 2, 3)) do
396396
expected = <<-HTML.strip_heredoc
397397
<div class="form-group">
398398
<label for="user_misc">Misc</label>
@@ -418,7 +418,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
418418
end
419419

420420
test "date selects with options and html_options are wrapped correctly" do
421-
Timecop.freeze(Time.utc(2012, 2, 3)) do
421+
travel_to(Time.utc(2012, 2, 3)) do
422422
expected = <<-HTML.strip_heredoc
423423
<div class="form-group">
424424
<label for="user_misc">Misc</label>
@@ -443,7 +443,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
443443
end
444444

445445
test "time selects are wrapped correctly" do
446-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
446+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
447447
expected = <<-HTML.strip_heredoc
448448
<div class="form-group">
449449
<label for="user_misc">Misc</label>
@@ -467,7 +467,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
467467

468468
test "time selects are wrapped correctly with error" do
469469
@user.errors.add(:misc, "error for test")
470-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
470+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
471471
expected = <<-HTML.strip_heredoc
472472
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
473473
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -494,7 +494,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
494494
end
495495

496496
test "time selects with options are wrapped correctly" do
497-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
497+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
498498
expected = <<-HTML.strip_heredoc
499499
<div class="form-group">
500500
<label for="user_misc">Misc</label>
@@ -519,7 +519,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
519519
end
520520

521521
test "time selects with options and html_options are wrapped correctly" do
522-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
522+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
523523
expected = <<-HTML.strip_heredoc
524524
<div class="form-group">
525525
<label for="user_misc">Misc</label>
@@ -544,7 +544,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
544544
end
545545

546546
test "datetime selects are wrapped correctly" do
547-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
547+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
548548
expected = <<-HTML.strip_heredoc
549549
<div class="form-group">
550550
<label for="user_misc">Misc</label>
@@ -575,7 +575,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
575575

576576
test "datetime selects are wrapped correctly with error" do
577577
@user.errors.add(:misc, "error for test")
578-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
578+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
579579
expected = <<-HTML.strip_heredoc
580580
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form">
581581
#{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
@@ -609,7 +609,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
609609
end
610610

611611
test "datetime selects with options are wrapped correctly" do
612-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
612+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
613613
expected = <<-HTML.strip_heredoc
614614
<div class="form-group">
615615
<label for="user_misc">Misc</label>
@@ -644,7 +644,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
644644
end
645645

646646
test "datetime selects with options and html_options are wrapped correctly" do
647-
Timecop.freeze(Time.utc(2012, 2, 3, 12, 0, 0)) do
647+
travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
648648
expected = <<-HTML.strip_heredoc
649649
<div class="form-group">
650650
<label for="user_misc">Misc</label>

test/test_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ENV["RAILS_ENV"] ||= "test"
22

3-
require "timecop"
43
require "diffy"
54
require "nokogiri"
65
require "equivalent-xml"

0 commit comments

Comments
 (0)