diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock index 3f48d2315ae..662ded88d80 100644 --- a/src/api/Gemfile.lock +++ b/src/api/Gemfile.lock @@ -398,7 +398,7 @@ GEM rubocop-performance (1.15.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.2) + rubocop-rails (2.17.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) diff --git a/src/api/spec/rails_helper.rb b/src/api/spec/rails_helper.rb index 53169689c4f..d31cab1dfec 100644 --- a/src/api/spec/rails_helper.rb +++ b/src/api/spec/rails_helper.rb @@ -26,7 +26,7 @@ config.include Haml::Helpers # load ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" + config.fixture_path = Rails.root.join('spec/fixtures') # set spec type based on their file location config.infer_spec_type_from_file_location! diff --git a/src/api/vendor/cache/rubocop-rails-2.17.2.gem b/src/api/vendor/cache/rubocop-rails-2.17.2.gem deleted file mode 100644 index 18e53bded98..00000000000 Binary files a/src/api/vendor/cache/rubocop-rails-2.17.2.gem and /dev/null differ diff --git a/src/api/vendor/cache/rubocop-rails-2.17.3.gem b/src/api/vendor/cache/rubocop-rails-2.17.3.gem new file mode 100644 index 00000000000..3dd889ae290 Binary files /dev/null and b/src/api/vendor/cache/rubocop-rails-2.17.3.gem differ