Fix tests fail cause of issue with grit stub
This commit is contained in:
parent
9014fb7525
commit
2032f4cd96
|
@ -11,12 +11,10 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
And 'I visit project "Shop" network page' do
|
||||
# Stub GraphCommit max_size to speed up test (10 commits vs. 650)
|
||||
Gitlab::GraphCommit.stub(max_count: 10)
|
||||
|
||||
project = Project.find_by_name("Shop")
|
||||
|
||||
# Stub out find_all to speed this up (10 commits vs. 650)
|
||||
commits = Grit::Commit.find_all(project.repo, nil, {max_count: 10})
|
||||
Grit::Commit.stub(:find_all).and_return(commits)
|
||||
|
||||
visit graph_project_path(project)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -122,9 +122,8 @@ module SharedPaths
|
|||
end
|
||||
|
||||
Given "I visit my project's network page" do
|
||||
# Stub out find_all to speed this up (10 commits vs. 650)
|
||||
commits = Grit::Commit.find_all(@project.repo, nil, {max_count: 10})
|
||||
Grit::Commit.stub(:find_all).and_return(commits)
|
||||
# Stub GraphCommit max_size to speed up test (10 commits vs. 650)
|
||||
Gitlab::GraphCommit.stub(max_count: 10)
|
||||
|
||||
visit graph_project_path(@project)
|
||||
end
|
||||
|
|
|
@ -2,18 +2,18 @@ require "grit"
|
|||
|
||||
module Gitlab
|
||||
class GraphCommit
|
||||
attr_accessor :time, :space
|
||||
attr_accessor :refs
|
||||
attr_accessor :time, :space, :refs
|
||||
|
||||
include ActionView::Helpers::TagHelper
|
||||
|
||||
def self.to_graph(project)
|
||||
@repo = project.repo
|
||||
commits = Grit::Commit.find_all(@repo, nil, {max_count: 650}).dup
|
||||
|
||||
commits = collect_commits(@repo).dup
|
||||
|
||||
ref_cache = {}
|
||||
|
||||
commits.map! {|c| GraphCommit.new(Commit.new(c))}
|
||||
commits.map! { |commit| GraphCommit.new(Commit.new(commit))}
|
||||
commits.each { |commit| commit.add_refs(ref_cache, @repo) }
|
||||
|
||||
days = GraphCommit.index_commits(commits)
|
||||
|
@ -23,6 +23,16 @@ module Gitlab
|
|||
return @days_json, @commits_json
|
||||
end
|
||||
|
||||
# Get commits from repository
|
||||
#
|
||||
def self.collect_commits repo
|
||||
Grit::Commit.find_all(repo, nil, {max_count: self.max_count})
|
||||
end
|
||||
|
||||
def self.max_count
|
||||
@max_count ||= 650
|
||||
end
|
||||
|
||||
# Method is adding time and space on the
|
||||
# list of commits. As well as returns date list
|
||||
# corelated with time set on commits.
|
||||
|
|
Loading…
Reference in a new issue