Merge branch 'ruby-upgrade'

rdy · Aug 9, 2019 · 0d54e60 · 0d54e60
2 parents 35d3ebd + 161a7ba
commit 0d54e60
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.2.5
+ruby-2.5.3
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.5
+  - 2.5.3
 before_install:
   - gem update --system
   - gem update bundler

diff --git a/lib/fixture_builder/configuration.rb b/lib/fixture_builder/configuration.rb
@@ -130,7 +130,7 @@ def rebuild_fixtures?
       if Dir.glob("#{fixture_directory}/*.yml").blank?
         puts "=> rebuilding fixtures because fixture directory #{fixture_directory} has no *.yml files"
         return true
-      elsif !::File.exists?(fixture_builder_file)
+      elsif !::File.exist?(fixture_builder_file)
         puts "=> rebuilding fixtures because fixture_builder config file #{fixture_builder_file} does not exist"
         return true
       elsif file_hashes_from_disk != file_hashes_from_config

diff --git a/lib/fixture_builder/fixtures_path.rb b/lib/fixture_builder/fixtures_path.rb
@@ -5,7 +5,7 @@ def self.absolute_rails_fixtures_path
     rescue
       if ENV["FIXTURES_PATH"]
         ENV["FIXTURES_PATH"]
-      elsif File.exists?(File.expand_path("spec/fixtures",::Rails.root))
+      elsif File.exist?(File.expand_path("spec/fixtures",::Rails.root))
         File.expand_path("spec/fixtures",::Rails.root)
       else
         File.expand_path("test/fixtures",::Rails.root)