summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-10-20 10:27:48 +0000
committerNick Thomas <nick@gitlab.com>2017-10-20 10:27:48 +0000
commitbc734d34479dfe80984b851153447ce03d4c93a0 (patch)
treeda18a7a238ba3b8ffdb2672d9a5f446472556429 /spec/lib
parentb4dc0ba2c57c150f847d255b0d2d831ff60728ad (diff)
parent314e5b5f20889971fef092c26bcb675ac2af4b07 (diff)
downloadgitlab-ce-bc734d34479dfe80984b851153447ce03d4c93a0.tar.gz
Merge branch '37391-wiki-disk-path-helper' into 'master'
Use wiki.disk_path See merge request gitlab-org/gitlab-ce!14930
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/github_import/wiki_formatter_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
index fcd90fab547..2662cc20b32 100644
--- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
@@ -11,7 +11,7 @@ describe Gitlab::GithubImport::WikiFormatter do
describe '#disk_path' do
it 'appends .wiki to project path' do
- expect(wiki.disk_path).to eq project.disk_path + '.wiki'
+ expect(wiki.disk_path).to eq project.wiki.disk_path
end
end