diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:43:32 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:43:32 +0900 |
| commit | df65334ecadbc426a535237211a4d8eec53f52c0 (patch) | |
| tree | 8312d4cac72946879304a346ee17b2b342d0e1e8 | |
| parent | 7ff9008f3e533f2e0442c7a07ef1c67c119822ea (diff) | |
| download | gitlab-ce-df65334ecadbc426a535237211a4d8eec53f52c0.tar.gz | |
Refactor: use keyword arguments for optional parameters
| -rw-r--r-- | app/models/wiki_page.rb | 2 | ||||
| -rw-r--r-- | app/services/wiki_pages/update_service.rb | 2 | ||||
| -rw-r--r-- | spec/models/wiki_page_spec.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index fa70b69f02f..12f12674e56 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -192,7 +192,7 @@ class WikiPage # # Returns the String SHA1 of the newly created page # or False if the save was unsuccessful. - def update(new_content = "", format = :markdown, message = nil, last_commit_sha = nil) + def update(new_content, format: :markdown, message: nil, last_commit_sha: nil) @attributes[:content] = new_content @attributes[:format] = format diff --git a/app/services/wiki_pages/update_service.rb b/app/services/wiki_pages/update_service.rb index 1046bb3be01..c628e6781af 100644 --- a/app/services/wiki_pages/update_service.rb +++ b/app/services/wiki_pages/update_service.rb @@ -1,7 +1,7 @@ module WikiPages class UpdateService < WikiPages::BaseService def execute(page) - if page.update(@params[:content], @params[:format], @params[:message], @params[:last_commit_sha]) + if page.update(@params[:content], format: @params[:format], message: @params[:message], last_commit_sha: @params[:last_commit_sha]) execute_hooks(page, 'update') end diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index 220b70503f0..732a32684e8 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -212,14 +212,14 @@ describe WikiPage, models: true do context 'with same last commit sha' do it 'returns true' do last_commit_sha = @page.commit.sha - expect(@page.update('more content', :markdown, nil, last_commit_sha)).to be_truthy + expect(@page.update('more content', last_commit_sha: last_commit_sha)).to be_truthy end end context 'with different last commit sha' do it 'raises exception' do last_commit_sha = 'xxx' - expect { @page.update('more content', :markdown, nil, last_commit_sha) }.to raise_error(WikiPage::PageChangedError) + expect { @page.update('more content', last_commit_sha: last_commit_sha) }.to raise_error(WikiPage::PageChangedError) end end end |
