Commit f8988b3d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '24255-search-fix' into 'master'

Fix broken commits search

## What does this MR do?

Fixes commits search



## What are the relevant issue numbers?


Closes #24255

See merge request !7339
parents 5db9c791 ebc44bef
...@@ -16,7 +16,7 @@ class SearchController < ApplicationController ...@@ -16,7 +16,7 @@ class SearchController < ApplicationController
@group = nil unless can?(current_user, :read_group, @group) @group = nil unless can?(current_user, :read_group, @group)
end end
return if params[:search].nil? || params[:search].blank? return if params[:search].blank?
@search_term = params[:search] @search_term = params[:search]
......
= render 'projects/commits/commit', project: @project, commit: commit = render 'projects/commits/commit', project: @project, commit: commit, ref: nil
---
title: Fix broken commits search
merge_request:
author:
require 'spec_helper'
feature 'Global search', feature: true do
let(:user) { create(:user) }
let(:project) { create(:project, namespace: user.namespace) }
before do
project.team << [user, :master]
login_with(user)
end
describe 'I search through the issues and I see pagination' do
before do
allow_any_instance_of(Gitlab::SearchResults).to receive(:per_page).and_return(1)
create_list(:issue, 2, project: project, title: 'initial')
end
it "has a pagination" do
visit dashboard_projects_path
fill_in "search", with: "initial"
click_button "Go"
select_filter("Issues")
expect(page).to have_selector('.gl-pagination .page', count: 2)
end
end
end
...@@ -100,6 +100,32 @@ describe "Search", feature: true do ...@@ -100,6 +100,32 @@ describe "Search", feature: true do
expect(page).to have_link(snippet.title) expect(page).to have_link(snippet.title)
end end
it 'finds a commit' do
visit namespace_project_path(project.namespace, project)
page.within '.search' do
fill_in 'search', with: 'add'
click_button 'Go'
end
click_link "Commits"
expect(page).to have_selector('.commit-row-description')
end
it 'finds a code' do
visit namespace_project_path(project.namespace, project)
page.within '.search' do
fill_in 'search', with: 'def'
click_button 'Go'
end
click_link "Code"
expect(page).to have_selector('.file-content .code')
end
end end
describe 'Right header search field', feature: true do describe 'Right header search field', feature: true do
......
...@@ -29,6 +29,7 @@ RSpec.configure do |config| ...@@ -29,6 +29,7 @@ RSpec.configure do |config|
config.include Devise::Test::ControllerHelpers, type: :controller config.include Devise::Test::ControllerHelpers, type: :controller
config.include Warden::Test::Helpers, type: :request config.include Warden::Test::Helpers, type: :request
config.include LoginHelpers, type: :feature config.include LoginHelpers, type: :feature
config.include SearchHelpers, type: :feature
config.include StubConfiguration config.include StubConfiguration
config.include EmailHelpers config.include EmailHelpers
config.include TestEnv config.include TestEnv
......
module SearchHelpers
def select_filter(name)
find(:xpath, "//ul[contains(@class, 'search-filter')]//a[contains(.,'#{name}')]").click
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment