Skip to content
Snippets Groups Projects
Commit e03a018d authored by Sato Hiroyuki's avatar Sato Hiroyuki
Browse files

Refactor: rename module and class names.

* Module: Graph -> Network
* Class: JsonBuilder -> Graph
parent 784aa266
No related branches found
No related tags found
1 merge request!3169Refactor network graph
Loading
Loading
@@ -22,7 +22,7 @@ class GraphController < ProjectResourceController
format.html
 
format.json do
@graph = Graph::JsonBuilder.new(project, @ref, @commit)
@graph = Network::Graph.new(project, @ref, @commit)
end
end
end
Loading
Loading
require "grit"
 
module Graph
module Network
class Commit
include ActionView::Helpers::TagHelper
 
Loading
Loading
require "grit"
 
module Graph
class JsonBuilder
module Network
class Graph
attr_accessor :days, :commits, :ref_cache, :repo
 
def self.max_count
Loading
Loading
@@ -19,7 +19,7 @@ module Graph
@days = index_commits
end
 
protected
protected
 
# Get commits from repository
#
Loading
Loading
@@ -30,8 +30,8 @@ module Graph
# Decorate with app/models/commit.rb
@commits.map! { |commit| Commit.new(commit) }
 
# Decorate with lib/gitlab/graph/commit.rb
@commits.map! { |commit| Graph::Commit.new(commit) }
# Decorate with app/model/network/commit.rb
@commits.map! { |commit| Network::Commit.new(commit) }
 
# add refs to each commit
@commits.each { |commit| commit.add_refs(ref_cache, repo) }
Loading
Loading
Loading
Loading
@@ -8,8 +8,8 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
 
When 'I visit project "Shop" network page' do
# Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)
Graph::JsonBuilder.stub(max_count: 10)
# Stub Graph max_size to speed up test (10 commits vs. 650)
Network::Graph.stub(max_count: 10)
 
project = Project.find_by_name("Shop")
visit project_graph_path(project, "master")
Loading
Loading
@@ -25,7 +25,7 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
end
 
And 'I switch ref to "stable"' do
When 'I switch ref to "stable"' do
page.select 'stable', :from => 'ref'
sleep 2
end
Loading
Loading
@@ -40,7 +40,7 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
end
 
And 'I looking for a commit by SHA of "v2.1.0"' do
When 'I looking for a commit by SHA of "v2.1.0"' do
within ".content .search" do
fill_in 'q', :with => '98d6492'
find('button').click
Loading
Loading
Loading
Loading
@@ -142,8 +142,8 @@ module SharedPaths
end
 
Given "I visit my project's network page" do
# Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)
Graph::JsonBuilder.stub(max_count: 10)
# Stub Graph max_size to speed up test (10 commits vs. 650)
Network::Graph.stub(max_count: 10)
 
visit project_graph_path(@project, root_ref)
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment