diff --git a/Gemfile b/Gemfile index a7b15f7d51893af11c1c8df0ed9e911e03cc8278..9d407c7510e97306c6b69f0bb5100f6ad32ce6c4 100644 --- a/Gemfile +++ b/Gemfile @@ -310,7 +310,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development -gem 'batch-loader', '~> 1.2.1' +gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7323b17d373e82575f1c18fe971759729e50f755..fedf8dbb1a21eefa0e2978288e6045ce6f0b9950 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.2.1) + batch-loader (1.2.2) bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -980,7 +980,7 @@ DEPENDENCIES aws-sdk babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader (~> 1.2.1) + batch-loader (~> 1.2.2) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 51b73551390d5f7e0318d5f4e7acb8e08b2f924f..9fb961bb061bf04c2d20e58bc5d3bc14e7e39df0 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -78,7 +78,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.2.1) + batch-loader (1.2.2) bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -971,7 +971,7 @@ DEPENDENCIES aws-sdk babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader (~> 1.2.1) + batch-loader (~> 1.2.2) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb index ed93f94d893d83e333b3f736eaa3a6a1fdbbaa4a..e8c03b587e2b989e2aa9331c3c4cc2e8553d4668 100644 --- a/spec/models/blob_spec.rb +++ b/spec/models/blob_spec.rb @@ -18,6 +18,7 @@ describe '.lazy' do let(:project) { create(:project, :repository) } + let(:same_project) { Project.find(project.id) } let(:other_project) { create(:project, :repository) } let(:commit_id) { 'e63f41fe459e62e1228fcef60d7189127aeba95a' } @@ -32,7 +33,7 @@ expect(other_project.repository).not_to receive(:blobs_at) changelog = described_class.lazy(project, commit_id, 'CHANGELOG') - contributing = described_class.lazy(project, commit_id, 'CONTRIBUTING.md') + contributing = described_class.lazy(same_project, commit_id, 'CONTRIBUTING.md') described_class.lazy(other_project, commit_id, 'CHANGELOG')