summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-24 07:43:53 +0000
committerDouwe Maan <douwe@gitlab.com>2015-09-24 07:43:53 +0000
commit4bf1e85cce80495da11d9ca86d15e8b43fef1141 (patch)
tree48e82f528830a73310860477cdf62c520f0d4645 /spec/helpers
parenta58c6e9a9561ffbb3d16a3a9a45bd90a34735b50 (diff)
parent150fb81ef90cba74bf7828e652e052b9ababcdf8 (diff)
downloadgitlab-ce-4bf1e85cce80495da11d9ca86d15e8b43fef1141.tar.gz
Merge branch 'fix-network-graph-refs' into 'master'
Remove git refs used internally by GitLab from network graph GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png) Closes #2702 See merge request !1410
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/graph_helper_spec.rb16
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/helpers/graph_helper_spec.rb b/spec/helpers/graph_helper_spec.rb
new file mode 100644
index 00000000000..4acf38771b7
--- /dev/null
+++ b/spec/helpers/graph_helper_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe GraphHelper do
+ describe '#get_refs' do
+ let(:project) { create(:project) }
+ let(:commit) { project.commit("master") }
+ let(:graph) { Network::Graph.new(project, 'master', commit, '') }
+
+ it 'filter our refs used by GitLab' do
+ allow(commit).to receive(:ref_names).and_return(['refs/merge-requests/abc', 'master', 'refs/tmp/xyz'])
+ self.instance_variable_set(:@graph, graph)
+ refs = get_refs(project.repository, commit)
+ expect(refs).to eq('master')
+ end
+ end
+end