Commit 91c07d16 authored by Yorick Peterse's avatar Yorick Peterse Committed by James Edwards-Jones

Fixed Rubocop deprecation warnings

parent 12d44272
...@@ -25,7 +25,7 @@ module Projects ...@@ -25,7 +25,7 @@ module Projects
# Check if we did extract public directory # Check if we did extract public directory
archive_public_path = File.join(archive_path, 'public') archive_public_path = File.join(archive_path, 'public')
raise 'pages miss the public folder' unless Dir.exists?(archive_public_path) raise 'pages miss the public folder' unless Dir.exist?(archive_public_path)
raise 'pages are outdated' unless latest? raise 'pages are outdated' unless latest?
deploy_page!(archive_public_path) deploy_page!(archive_public_path)
......
...@@ -5,7 +5,7 @@ describe Projects::UpdatePagesService do ...@@ -5,7 +5,7 @@ describe Projects::UpdatePagesService do
let(:pipeline) { create :ci_pipeline, project: project, sha: project.commit('HEAD').sha } let(:pipeline) { create :ci_pipeline, project: project, sha: project.commit('HEAD').sha }
let(:build) { create :ci_build, pipeline: pipeline, ref: 'HEAD' } let(:build) { create :ci_build, pipeline: pipeline, ref: 'HEAD' }
let(:invalid_file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png') } let(:invalid_file) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png') }
subject { described_class.new(project, build) } subject { described_class.new(project, build) }
before do before do
...@@ -18,7 +18,7 @@ describe Projects::UpdatePagesService do ...@@ -18,7 +18,7 @@ describe Projects::UpdatePagesService do
let(:empty_file) { fixture_file_upload(Rails.root + "spec/fixtures/pages_empty.#{format}") } let(:empty_file) { fixture_file_upload(Rails.root + "spec/fixtures/pages_empty.#{format}") }
let(:metadata) do let(:metadata) do
filename = Rails.root + "spec/fixtures/pages.#{format}.meta" filename = Rails.root + "spec/fixtures/pages.#{format}.meta"
fixture_file_upload(filename) if File.exists?(filename) fixture_file_upload(filename) if File.exist?(filename)
end end
before do before do
...@@ -73,7 +73,7 @@ describe Projects::UpdatePagesService do ...@@ -73,7 +73,7 @@ describe Projects::UpdatePagesService do
build.update_attributes(artifacts_file: invalid_file) build.update_attributes(artifacts_file: invalid_file)
expect(execute).not_to eq(:success) expect(execute).not_to eq(:success)
end end
def execute def execute
subject.execute[:status] subject.execute[:status]
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment