Commit 5f24bdb7 authored by Hiroyuki Sato's avatar Hiroyuki Sato
Browse files

Render not found when failing to look for a commit

parent 0a44ecf3
...@@ -8,10 +8,6 @@ class Projects::NetworkController < Projects::ApplicationController ...@@ -8,10 +8,6 @@ class Projects::NetworkController < Projects::ApplicationController
before_filter :require_non_empty_project before_filter :require_non_empty_project
def show def show
if @options[:q]
@commit = @project.repository.commit(@options[:q]) || @commit
end
respond_to do |format| respond_to do |format|
format.html format.html
......
...@@ -34,3 +34,7 @@ Feature: Project Network Graph ...@@ -34,3 +34,7 @@ Feature: Project Network Graph
Then page should not have content not cotaining "v2.1.0" Then page should not have content not cotaining "v2.1.0"
When click "Show only selected branch" checkbox When click "Show only selected branch" checkbox
Then page should have content not cotaining "v2.1.0" Then page should have content not cotaining "v2.1.0"
Scenario: I should fail to look for a commit
When I look for a commit by ";"
Then page status code should be 404
...@@ -87,4 +87,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps ...@@ -87,4 +87,11 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
page.should have_content 'v2.1.0' page.should have_content 'v2.1.0'
end end
end end
When 'I look for a commit by ";"' do
within ".content .search" do
fill_in 'q', with: ';'
find('button').click
end
end
end end
...@@ -51,6 +51,10 @@ module SharedProject ...@@ -51,6 +51,10 @@ module SharedProject
page.should have_content("Features:") page.should have_content("Features:")
end end
Then 'page status code should be 404' do
page.status_code.should == 404
end
def current_project def current_project
@project ||= Project.first @project ||= Project.first
end end
......
...@@ -94,19 +94,23 @@ def extract_ref(id) ...@@ -94,19 +94,23 @@ def extract_ref(id)
# Automatically renders `not_found!` if a valid tree path could not be # Automatically renders `not_found!` if a valid tree path could not be
# resolved (e.g., when a user inserts an invalid path or ref). # resolved (e.g., when a user inserts an invalid path or ref).
def assign_ref_vars def assign_ref_vars
# assign allowed options
allowed_options = ["filter_ref", "q"]
@options = params.select {|key, value| allowed_options.include?(key) && !value.blank? }
@options = HashWithIndifferentAccess.new(@options)
@id = get_id @id = get_id
@ref, @path = extract_ref(@id) @ref, @path = extract_ref(@id)
@repo = @project.repository @repo = @project.repository
@commit = @repo.commit(@ref) if @options[:q].blank?
@commit = @repo.commit(@ref)
else
@commit = @repo.commit(@options[:q])
end
@tree = Tree.new(@repo, @commit.id, @ref, @path) @tree = Tree.new(@repo, @commit.id, @ref, @path)
@hex_path = Digest::SHA1.hexdigest(@path) @hex_path = Digest::SHA1.hexdigest(@path)
@logs_path = logs_file_project_ref_path(@project, @ref, @path) @logs_path = logs_file_project_ref_path(@project, @ref, @path)
# assign allowed options
allowed_options = ["filter_ref", "q"]
@options = params.select {|key, value| allowed_options.include?(key) && !value.blank? }
@options = HashWithIndifferentAccess.new(@options)
raise InvalidPathError unless @tree.exists? raise InvalidPathError unless @tree.exists?
rescue RuntimeError, NoMethodError, InvalidPathError rescue RuntimeError, NoMethodError, InvalidPathError
not_found! not_found!
......
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