From 7b71ace04eec4664a2abd2eb003c6f8291dbab27 Mon Sep 17 00:00:00 2001 From: Barry Gordon Date: Fri, 9 Apr 2021 11:17:51 +0100 Subject: [PATCH 1/3] Ensure no bundler1 fixtures are actually testing bundler2 --- .../fixtures/projects/bundler1/multiple_blocking/Gemfile.lock | 2 +- .../fixtures/projects/bundler1/transitive_blocking/Gemfile.lock | 2 +- .../fixtures/projects/bundler1/version_conflict/Gemfile.lock | 2 +- .../projects/bundler1/version_specified_bundler_2/gems.locked | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundler/spec/fixtures/projects/bundler1/multiple_blocking/Gemfile.lock b/bundler/spec/fixtures/projects/bundler1/multiple_blocking/Gemfile.lock index 2555bab90b..4d9431f430 100644 --- a/bundler/spec/fixtures/projects/bundler1/multiple_blocking/Gemfile.lock +++ b/bundler/spec/fixtures/projects/bundler1/multiple_blocking/Gemfile.lock @@ -67,4 +67,4 @@ DEPENDENCIES activesupport (= 5.0.0) BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/bundler/spec/fixtures/projects/bundler1/transitive_blocking/Gemfile.lock b/bundler/spec/fixtures/projects/bundler1/transitive_blocking/Gemfile.lock index 0c1926a7f8..1459e11cef 100644 --- a/bundler/spec/fixtures/projects/bundler1/transitive_blocking/Gemfile.lock +++ b/bundler/spec/fixtures/projects/bundler1/transitive_blocking/Gemfile.lock @@ -116,4 +116,4 @@ DEPENDENCIES rails (= 5.2.0) BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/bundler/spec/fixtures/projects/bundler1/version_conflict/Gemfile.lock b/bundler/spec/fixtures/projects/bundler1/version_conflict/Gemfile.lock index d8a66715c8..de968b2b14 100644 --- a/bundler/spec/fixtures/projects/bundler1/version_conflict/Gemfile.lock +++ b/bundler/spec/fixtures/projects/bundler1/version_conflict/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES rspec-support (= 3.5.0) BUNDLED WITH - 2.0.0.dev + 1.17.3 diff --git a/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked b/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked index e10fb68749..ff0f287001 100644 --- a/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked +++ b/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked @@ -12,4 +12,4 @@ DEPENDENCIES statesman (~> 1.2.0) BUNDLED WITH - 2.0.0.dev + 1.17.3 From 52e23985f8855f60c2e8d0b69b33a82dc3f09dd2 Mon Sep 17 00:00:00 2001 From: Barry Gordon Date: Fri, 9 Apr 2021 12:19:16 +0100 Subject: [PATCH 2/3] Remove a bundler 2 test fixture from v1 --- .../spec/dependabot/bundler/file_parser_spec.rb | 2 +- .../version_specified_bundler_2/gems.locked | 15 --------------- .../bundler1/version_specified_bundler_2/gems.rb | 4 ---- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked delete mode 100644 bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.rb diff --git a/bundler/spec/dependabot/bundler/file_parser_spec.rb b/bundler/spec/dependabot/bundler/file_parser_spec.rb index 6f240f7a2e..80ed9be424 100644 --- a/bundler/spec/dependabot/bundler/file_parser_spec.rb +++ b/bundler/spec/dependabot/bundler/file_parser_spec.rb @@ -135,7 +135,7 @@ end end - context "from a gems.rb and gems.locked" do + context "from a gems.rb and gems.locked", :bundler_v2_only do let(:dependency_files) { bundler_project_dependency_files("version_specified_bundler_2") } its(:length) { is_expected.to eq(2) } diff --git a/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked b/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked deleted file mode 100644 index ff0f287001..0000000000 --- a/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.locked +++ /dev/null @@ -1,15 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - business (1.4.0) - statesman (1.2.1) - -PLATFORMS - ruby - -DEPENDENCIES - business (~> 1.4.0) - statesman (~> 1.2.0) - -BUNDLED WITH - 1.17.3 diff --git a/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.rb b/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.rb deleted file mode 100644 index 381ba235a8..0000000000 --- a/bundler/spec/fixtures/projects/bundler1/version_specified_bundler_2/gems.rb +++ /dev/null @@ -1,4 +0,0 @@ -source "https://rubygems.org" - -gem "business", "~> 1.4.0" -gem "statesman", "~> 1.2.0" From 45e1d8977b9a6fa6776e6758cdb3e763bfa839d0 Mon Sep 17 00:00:00 2001 From: Barry Gordon Date: Fri, 9 Apr 2021 12:25:08 +0100 Subject: [PATCH 3/3] reintate test for v1, clarify fixture name --- .../spec/dependabot/bundler/file_parser_spec.rb | 4 ++-- .../version_specified_gems_rb/gems.locked | 15 +++++++++++++++ .../version_specified_gems_rb}/gems.rb | 0 .../gems.locked | 0 .../bundler2/version_specified_gems_rb/gems.rb | 4 ++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 bundler/spec/fixtures/projects/bundler1/version_specified_gems_rb/gems.locked rename bundler/spec/fixtures/projects/{bundler2/version_specified_bundler_2 => bundler1/version_specified_gems_rb}/gems.rb (100%) rename bundler/spec/fixtures/projects/bundler2/{version_specified_bundler_2 => version_specified_gems_rb}/gems.locked (100%) create mode 100644 bundler/spec/fixtures/projects/bundler2/version_specified_gems_rb/gems.rb diff --git a/bundler/spec/dependabot/bundler/file_parser_spec.rb b/bundler/spec/dependabot/bundler/file_parser_spec.rb index 80ed9be424..1f692ec570 100644 --- a/bundler/spec/dependabot/bundler/file_parser_spec.rb +++ b/bundler/spec/dependabot/bundler/file_parser_spec.rb @@ -135,8 +135,8 @@ end end - context "from a gems.rb and gems.locked", :bundler_v2_only do - let(:dependency_files) { bundler_project_dependency_files("version_specified_bundler_2") } + context "from a gems.rb and gems.locked" do + let(:dependency_files) { bundler_project_dependency_files("version_specified_gems_rb") } its(:length) { is_expected.to eq(2) } diff --git a/bundler/spec/fixtures/projects/bundler1/version_specified_gems_rb/gems.locked b/bundler/spec/fixtures/projects/bundler1/version_specified_gems_rb/gems.locked new file mode 100644 index 0000000000..ff0f287001 --- /dev/null +++ b/bundler/spec/fixtures/projects/bundler1/version_specified_gems_rb/gems.locked @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + business (1.4.0) + statesman (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + business (~> 1.4.0) + statesman (~> 1.2.0) + +BUNDLED WITH + 1.17.3 diff --git a/bundler/spec/fixtures/projects/bundler2/version_specified_bundler_2/gems.rb b/bundler/spec/fixtures/projects/bundler1/version_specified_gems_rb/gems.rb similarity index 100% rename from bundler/spec/fixtures/projects/bundler2/version_specified_bundler_2/gems.rb rename to bundler/spec/fixtures/projects/bundler1/version_specified_gems_rb/gems.rb diff --git a/bundler/spec/fixtures/projects/bundler2/version_specified_bundler_2/gems.locked b/bundler/spec/fixtures/projects/bundler2/version_specified_gems_rb/gems.locked similarity index 100% rename from bundler/spec/fixtures/projects/bundler2/version_specified_bundler_2/gems.locked rename to bundler/spec/fixtures/projects/bundler2/version_specified_gems_rb/gems.locked diff --git a/bundler/spec/fixtures/projects/bundler2/version_specified_gems_rb/gems.rb b/bundler/spec/fixtures/projects/bundler2/version_specified_gems_rb/gems.rb new file mode 100644 index 0000000000..381ba235a8 --- /dev/null +++ b/bundler/spec/fixtures/projects/bundler2/version_specified_gems_rb/gems.rb @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "business", "~> 1.4.0" +gem "statesman", "~> 1.2.0"