diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
| commit | 6848c4f93c7727d6975632135a04c5633c1781f1 (patch) | |
| tree | 79de7b002747e9906e7563a81bba5a1f1979b679 /spec/models/project_wiki_spec.rb | |
| parent | ccd8cd283c4fade866542ea70caed770f675940c (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-gl-ui-tooltip.tar.gz | |
Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'spec/models/project_wiki_spec.rb')
| -rw-r--r-- | spec/models/project_wiki_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb index f38fc191943..cc5e34782ec 100644 --- a/spec/models/project_wiki_spec.rb +++ b/spec/models/project_wiki_spec.rb @@ -145,7 +145,7 @@ describe ProjectWiki do end it "returns nil if the page does not exist" do - expect(subject.find_page("non-existant")).to eq(nil) + expect(subject.find_page("non-existent")).to eq(nil) end it "can find a page by slug" do @@ -226,7 +226,7 @@ describe ProjectWiki do end it 'returns nil if the page does not exist' do - expect(subject.find_file('non-existant')).to eq(nil) + expect(subject.find_file('non-existent')).to eq(nil) end it 'returns a Gitlab::Git::WikiFile instance' do |