diff options
Diffstat (limited to 'spec/services/projects/update_pages_service_spec.rb')
-rw-r--r-- | spec/services/projects/update_pages_service_spec.rb | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb index 2e02cb56668..374ce4f4ce2 100644 --- a/spec/services/projects/update_pages_service_spec.rb +++ b/spec/services/projects/update_pages_service_spec.rb @@ -53,7 +53,7 @@ RSpec.describe Projects::UpdatePagesService do # Check that all expected files are extracted %w[index.html zero .hidden/file].each do |filename| - expect(File.exist?(File.join(project.public_pages_path, filename))).to be_truthy + expect(File.exist?(File.join(project.pages_path, 'public', filename))).to be_truthy end end @@ -65,15 +65,17 @@ RSpec.describe Projects::UpdatePagesService do it 'removes pages after destroy' do expect(PagesWorker).to receive(:perform_in) expect(project.pages_deployed?).to be_falsey + expect(Dir.exist?(File.join(project.pages_path))).to be_falsey expect(execute).to eq(:success) expect(project.pages_metadatum).to be_deployed expect(project.pages_deployed?).to be_truthy + expect(Dir.exist?(File.join(project.pages_path))).to be_truthy project.destroy - expect(project.pages_deployed?).to be_falsey + expect(Dir.exist?(File.join(project.pages_path))).to be_falsey expect(ProjectPagesMetadatum.find_by_project_id(project)).to be_nil end @@ -160,19 +162,9 @@ RSpec.describe Projects::UpdatePagesService do end context 'with background jobs running', :sidekiq_inline do - where(:ci_atomic_processing) do - [true, false] - end - - with_them do - before do - stub_feature_flags(ci_atomic_processing: ci_atomic_processing) - end - - it 'succeeds' do - expect(project.pages_deployed?).to be_falsey - expect(execute).to eq(:success) - end + it 'succeeds' do + expect(project.pages_deployed?).to be_falsey + expect(execute).to eq(:success) end end end |