diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2014-07-28 00:27:15 +0200 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-11 11:31:37 +0200 |
commit | da7e14c864eb039ffe1c06409681721892917b71 (patch) | |
tree | adcc5ac17ffeb26c17527164ebe56bfb33ffa05c /features | |
parent | 9d3e384ae6553fee85b7a1ed2b99a18a9884606e (diff) | |
download | gitlab-ce-da7e14c864eb039ffe1c06409681721892917b71.tar.gz |
fix searching on empty project, prevent 500
Fix hound
Diffstat (limited to 'features')
-rw-r--r-- | features/project/source/search_code.feature | 10 | ||||
-rw-r--r-- | features/steps/project/search_code.rb | 12 | ||||
-rw-r--r-- | features/steps/shared/project.rb | 7 |
3 files changed, 23 insertions, 6 deletions
diff --git a/features/project/source/search_code.feature b/features/project/source/search_code.feature index ad8a650d895..93b326696d0 100644 --- a/features/project/source/search_code.feature +++ b/features/project/source/search_code.feature @@ -1,9 +1,15 @@ Feature: Project Search code Background: Given I sign in as a user - And I own project "Shop" - Given I visit project source page Scenario: Search for term "coffee" + Given I own project "Shop" + And I visit project source page When I search for term "coffee" Then I should see files from repository containing "coffee" + + Scenario: Search on empty project + Given I own an empty project + And I visit my project's home page + When I search for term "coffee" + Then I should see empty result diff --git a/features/steps/project/search_code.rb b/features/steps/project/search_code.rb index 8d130a8ed0d..affa7d3b43b 100644 --- a/features/steps/project/search_code.rb +++ b/features/steps/project/search_code.rb @@ -3,14 +3,18 @@ class ProjectSearchCode < Spinach::FeatureSteps include SharedProject include SharedPaths - When 'I search for term "coffee"' do + step 'I search for term "coffee"' do fill_in "search", with: "coffee" click_button "Go" click_link 'Repository Code' end - Then 'I should see files from repository containing "coffee"' do - page.should have_content "coffee" - page.should have_content " CONTRIBUTING.md" + step 'I should see files from repository containing "coffee"' do + page.should have_content 'coffee' + page.should have_content 'CONTRIBUTING.md' + end + + step 'I should see empty result' do + page.should have_content "We couldn't find any matching code" end end diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index 655840f447d..c131976614f 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -21,6 +21,13 @@ module SharedProject @project.team << [@user, :master] end + # Create an empty project without caring about the name + And 'I own an empty project' do + @project = create(:empty_project, + name: 'Empty Project', namespace: @user.namespace) + @project.team << [@user, :master] + end + And 'project "Shop" has push event' do @project = Project.find_by(name: "Shop") |