Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-02-07 18:42:55 +0300
committerSean McGivern <sean@mcgivern.me.uk>2018-02-07 18:42:55 +0300
commit683984f2e3e5ae72f375748ccfc5bfbf605911fa (patch)
tree49498057c4f130412f34dd6e4a6c1a2e9358cb40 /spec/helpers
parent15d766fc9345858db5e3c55da47204fb61a5531f (diff)
parent73e78c4e1517dd50bd5dd0934e0f62288de2971b (diff)
Merge branch 'zj-refs-hash' into 'master'
Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/graph_helper_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/helpers/graph_helper_spec.rb b/spec/helpers/graph_helper_spec.rb
index 400635abdde..1f8a38dc697 100644
--- a/spec/helpers/graph_helper_spec.rb
+++ b/spec/helpers/graph_helper_spec.rb
@@ -7,10 +7,10 @@ describe GraphHelper do
let(:graph) { Network::Graph.new(project, 'master', commit, '') }
it 'filters 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')
+ refs = refs(project.repository, commit)
+
+ expect(refs).to match('master')
end
end
end