summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-03-18 10:13:26 +0000
committerRémy Coutable <remy@rymai.me>2019-03-18 10:13:26 +0000
commita52d7dfaa9b72e4442a1723d30b84bc349b27215 (patch)
tree7eb1fec0288fc7d40f6e5dd0cd3e0c672100dec0 /spec
parentf696bacba2e09f4f4ea24b6f63fae0913f24d38a (diff)
parentda18211fec5ecb9581a5075d22adec743bb9f901 (diff)
downloadgitlab-ce-a52d7dfaa9b72e4442a1723d30b84bc349b27215.tar.gz
Merge branch 'sh-fix-issue-59065' into 'master'
Fix Error 500 when user commits Wiki page with no commit message Closes #59065 See merge request gitlab-org/gitlab-ce!26247
Diffstat (limited to 'spec')
-rw-r--r--spec/models/project_wiki_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 3ccc706edf2..7be8d67ba9e 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -71,6 +71,14 @@ describe ProjectWiki do
expect(project_wiki.create_page("index", "test content")).to be_truthy
end
+ it "creates a new wiki repo with a default commit message" do
+ expect(project_wiki.create_page("index", "test content", :markdown, "")).to be_truthy
+
+ page = project_wiki.find_page('index')
+
+ expect(page.last_version.message).to eq("#{user.username} created page: index")
+ end
+
it "raises CouldNotCreateWikiError if it can't create the wiki repository" do
# Create a fresh project which will not have a wiki
project_wiki = described_class.new(create(:project), user)