Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb
index 626517f8fa0..379cbe83a08 100644
--- a/spec/finders/projects_finder_spec.rb
+++ b/spec/finders/projects_finder_spec.rb
@@ -85,6 +85,24 @@ describe ProjectsFinder, :do_not_mock_admin_mode do
         end
       end
 
+      describe 'regression: Combination of id_before/id_after and joins requires fully qualified column names' do
+        context 'only returns projects with a project id less than given and matching search' do
+          subject { finder.execute.joins(:route) }
+
+          let(:params) { { id_before: public_project.id }}
+
+          it { is_expected.to eq([internal_project]) }
+        end
+
+        context 'only returns projects with a project id greater than given and matching search' do
+          subject { finder.execute.joins(:route) }
+
+          let(:params) { { id_after: internal_project.id }}
+
+          it { is_expected.to eq([public_project]) }
+        end
+      end
+
       describe 'filter by visibility_level' do
         before do
           private_project.add_maintainer(user)