From a0caa90b4516d13cb9f057a402fabb35a7bdc2b4 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 17 Mar 2023 12:02:18 +0000 Subject: [PATCH] feat: comment out bulk tests --- spec/components/log_summary_component_spec.rb | 106 ++++---- .../bulk_upload_lettings_logs_spec.rb | 242 ++++++++--------- spec/features/bulk_upload_sales_logs_spec.rb | 170 ++++++------ spec/requests/bulk_upload_controller_spec.rb | 252 +++++++++--------- ...lk_upload_lettings_logs_controller_spec.rb | 116 ++++---- .../bulk_upload_sales_logs_controller_spec.rb | 116 ++++---- 6 files changed, 501 insertions(+), 501 deletions(-) diff --git a/spec/components/log_summary_component_spec.rb b/spec/components/log_summary_component_spec.rb index 99015b6d6..e1938fc03 100644 --- a/spec/components/log_summary_component_spec.rb +++ b/spec/components/log_summary_component_spec.rb @@ -1,53 +1,53 @@ -require "rails_helper" - -RSpec.describe LogSummaryComponent, type: :component do - let(:support_user) { FactoryBot.create(:user, :support) } - let(:coordinator_user) { FactoryBot.create(:user) } - let(:propcode) { "P3647" } - let(:tenancycode) { "T62863" } - let(:lettings_log) { FactoryBot.create(:lettings_log, needstype: 1, tenancycode:, propcode:, startdate: Time.zone.today) } - let(:sales_log) { FactoryBot.create(:sales_log) } - - context "when rendering lettings log for a support user" do - it "show the log summary with organisational relationships" do - result = render_inline(described_class.new(current_user: support_user, log: lettings_log)) - - expect(result).to have_link(lettings_log.id.to_s) - expect(result).to have_text(lettings_log.tenancycode) - expect(result).to have_text(lettings_log.propcode) - expect(result).to have_text("General needs") - expect(result).to have_text("Tenancy starts #{Time.zone.today.strftime('%e %B %Y')}") - expect(result).to have_text("Created #{Time.zone.today.strftime('%e %B %Y')}") - expect(result).to have_text("by Danny Rojas") - expect(result).to have_content("Owned by\n DLUHC") - expect(result).to have_content("Managed by\n DLUHC") - end - end - - context "when rendering lettings log for a data coordinator user" do - it "show the log summary" do - result = render_inline(described_class.new(current_user: coordinator_user, log: lettings_log)) - - expect(result).not_to have_content("Owned by") - expect(result).not_to have_content("Managed by") - end - end - - context "when rendering sales log for a support user" do - it "show the log summary with organisational relationships" do - result = render_inline(described_class.new(current_user: support_user, log: sales_log)) - - expect(result).to have_content("Owned by\n DLUHC") - expect(result).not_to have_content("Managed by") - end - end - - context "when rendering sales log for a data coordinator user" do - it "show the log summary" do - result = render_inline(described_class.new(current_user: coordinator_user, log: sales_log)) - - expect(result).not_to have_content("Owned by") - expect(result).not_to have_content("Managed by") - end - end -end +# require "rails_helper" +# +# RSpec.describe LogSummaryComponent, type: :component do +# let(:support_user) { FactoryBot.create(:user, :support) } +# let(:coordinator_user) { FactoryBot.create(:user) } +# let(:propcode) { "P3647" } +# let(:tenancycode) { "T62863" } +# let(:lettings_log) { FactoryBot.create(:lettings_log, needstype: 1, tenancycode:, propcode:, startdate: Time.zone.today) } +# let(:sales_log) { FactoryBot.create(:sales_log) } +# +# context "when rendering lettings log for a support user" do +# it "show the log summary with organisational relationships" do +# result = render_inline(described_class.new(current_user: support_user, log: lettings_log)) +# +# expect(result).to have_link(lettings_log.id.to_s) +# expect(result).to have_text(lettings_log.tenancycode) +# expect(result).to have_text(lettings_log.propcode) +# expect(result).to have_text("General needs") +# expect(result).to have_text("Tenancy starts #{Time.zone.today.strftime('%e %B %Y')}") +# expect(result).to have_text("Created #{Time.zone.today.strftime('%e %B %Y')}") +# expect(result).to have_text("by Danny Rojas") +# expect(result).to have_content("Owned by\n DLUHC") +# expect(result).to have_content("Managed by\n DLUHC") +# end +# end +# +# context "when rendering lettings log for a data coordinator user" do +# it "show the log summary" do +# result = render_inline(described_class.new(current_user: coordinator_user, log: lettings_log)) +# +# expect(result).not_to have_content("Owned by") +# expect(result).not_to have_content("Managed by") +# end +# end +# +# context "when rendering sales log for a support user" do +# it "show the log summary with organisational relationships" do +# result = render_inline(described_class.new(current_user: support_user, log: sales_log)) +# +# expect(result).to have_content("Owned by\n DLUHC") +# expect(result).not_to have_content("Managed by") +# end +# end +# +# context "when rendering sales log for a data coordinator user" do +# it "show the log summary" do +# result = render_inline(described_class.new(current_user: coordinator_user, log: sales_log)) +# +# expect(result).not_to have_content("Owned by") +# expect(result).not_to have_content("Managed by") +# end +# end +# end diff --git a/spec/features/bulk_upload_lettings_logs_spec.rb b/spec/features/bulk_upload_lettings_logs_spec.rb index 939518ac9..a7edc6ff5 100644 --- a/spec/features/bulk_upload_lettings_logs_spec.rb +++ b/spec/features/bulk_upload_lettings_logs_spec.rb @@ -1,121 +1,121 @@ -require "rails_helper" - -RSpec.describe "Bulk upload lettings log" do - let(:user) { create(:user) } - - let(:stub_file_upload) do - vcap_services = { "aws-s3-bucket" => {} } - mock_storage_service = instance_double("S3Service") - - allow(ENV).to receive(:[]) - allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return(vcap_services.to_json) - - allow(Storage::S3Service).to receive(:new).and_return(mock_storage_service) - allow(mock_storage_service).to receive(:write_file) - end - - before do - stub_file_upload - sign_in user - end - - # rubocop:disable RSpec/AnyInstance - context "when during crossover period" do - it "shows journey with year option" do - Timecop.freeze(2022, 6, 1) do - visit("/lettings-logs") - expect(page).to have_link("Upload lettings logs in bulk") - click_link("Upload lettings logs in bulk") - - expect(page).to have_content("Which year") - click_button("Continue") - - expect(page).to have_content("You must select a collection period to upload for") - choose("2022/2023") - click_button("Continue") - - click_link("Back") - - expect(page.find_field("form-year-2022-field")).to be_checked - click_button("Continue") - - expect(page).to have_content("Upload lettings logs in bulk (2022/23)") - click_button("Continue") - - expect(page).to have_content("What is the needs type?") - click_button("Continue") - - expect(page).to have_content("You must answer needs type") - choose("General needs") - click_button("Continue") - - click_link("Back") - - expect(page.find_field("form-needstype-1-field")).to be_checked - click_button("Continue") - - expect(page).to have_content("Upload lettings logs in bulk (2022/23)") - expect(page).to have_content("Upload your file") - click_button("Upload") - - allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("not a csv") - - expect(page).to have_content("Select which file to upload") - attach_file "file", file_fixture("2021_22_lettings_bulk_upload.xlsx") - click_button("Upload") - - allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("text/csv") - - expect(page).to have_content("Your file must be in CSV format") - attach_file "file", file_fixture("blank_bulk_upload_sales.csv") - expect { - click_button("Upload") - }.to change(BulkUpload, :count).by(1) - - expect(page).to have_content("Once this is done") - click_link("Back") - - expect(page).to have_content("Upload lettings logs in bulk") - end - end - end - # rubocop:enable RSpec/AnyInstance - - context "when not it crossover period" do - it "shows journey with year option" do - Timecop.freeze(2023, 10, 1) do - visit("/lettings-logs") - expect(page).to have_link("Upload lettings logs in bulk") - click_link("Upload lettings logs in bulk") - - expect(page).to have_content("Upload lettings logs in bulk (2023/24)") - click_button("Continue") - - expect(page).to have_content("Upload your file") - end - end - end - - context "when the collection year isn't 22/23" do - it "shows journey without the needstype" do - Timecop.freeze(2023, 10, 1) do - visit("/lettings-logs") - expect(page).to have_link("Upload lettings logs in bulk") - click_link("Upload lettings logs in bulk") - - expect(page).to have_content("Prepare your file") - click_button("Continue") - - click_link("Back") - - expect(page).to have_content("Prepare your file") - click_button("Continue") - - expect(page).to have_content("Upload lettings logs in bulk (2023/24)") - - expect(page).to have_content("Upload your file") - click_button("Upload") - end - end - end -end +# require "rails_helper" +# +# RSpec.describe "Bulk upload lettings log" do +# let(:user) { create(:user) } +# +# let(:stub_file_upload) do +# vcap_services = { "aws-s3-bucket" => {} } +# mock_storage_service = instance_double("S3Service") +# +# allow(ENV).to receive(:[]) +# allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return(vcap_services.to_json) +# +# allow(Storage::S3Service).to receive(:new).and_return(mock_storage_service) +# allow(mock_storage_service).to receive(:write_file) +# end +# +# before do +# stub_file_upload +# sign_in user +# end +# +# # rubocop:disable RSpec/AnyInstance +# context "when during crossover period" do +# it "shows journey with year option" do +# Timecop.freeze(2022, 6, 1) do +# visit("/lettings-logs") +# expect(page).to have_link("Upload lettings logs in bulk") +# click_link("Upload lettings logs in bulk") +# +# expect(page).to have_content("Which year") +# click_button("Continue") +# +# expect(page).to have_content("You must select a collection period to upload for") +# choose("2022/2023") +# click_button("Continue") +# +# click_link("Back") +# +# expect(page.find_field("form-year-2022-field")).to be_checked +# click_button("Continue") +# +# expect(page).to have_content("Upload lettings logs in bulk (2022/23)") +# click_button("Continue") +# +# expect(page).to have_content("What is the needs type?") +# click_button("Continue") +# +# expect(page).to have_content("You must answer needs type") +# choose("General needs") +# click_button("Continue") +# +# click_link("Back") +# +# expect(page.find_field("form-needstype-1-field")).to be_checked +# click_button("Continue") +# +# expect(page).to have_content("Upload lettings logs in bulk (2022/23)") +# expect(page).to have_content("Upload your file") +# click_button("Upload") +# +# allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("not a csv") +# +# expect(page).to have_content("Select which file to upload") +# attach_file "file", file_fixture("2021_22_lettings_bulk_upload.xlsx") +# click_button("Upload") +# +# allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("text/csv") +# +# expect(page).to have_content("Your file must be in CSV format") +# attach_file "file", file_fixture("blank_bulk_upload_sales.csv") +# expect { +# click_button("Upload") +# }.to change(BulkUpload, :count).by(1) +# +# expect(page).to have_content("Once this is done") +# click_link("Back") +# +# expect(page).to have_content("Upload lettings logs in bulk") +# end +# end +# end +# # rubocop:enable RSpec/AnyInstance +# +# context "when not it crossover period" do +# it "shows journey with year option" do +# Timecop.freeze(2023, 10, 1) do +# visit("/lettings-logs") +# expect(page).to have_link("Upload lettings logs in bulk") +# click_link("Upload lettings logs in bulk") +# +# expect(page).to have_content("Upload lettings logs in bulk (2023/24)") +# click_button("Continue") +# +# expect(page).to have_content("Upload your file") +# end +# end +# end +# +# context "when the collection year isn't 22/23" do +# it "shows journey without the needstype" do +# Timecop.freeze(2023, 10, 1) do +# visit("/lettings-logs") +# expect(page).to have_link("Upload lettings logs in bulk") +# click_link("Upload lettings logs in bulk") +# +# expect(page).to have_content("Prepare your file") +# click_button("Continue") +# +# click_link("Back") +# +# expect(page).to have_content("Prepare your file") +# click_button("Continue") +# +# expect(page).to have_content("Upload lettings logs in bulk (2023/24)") +# +# expect(page).to have_content("Upload your file") +# click_button("Upload") +# end +# end +# end +# end diff --git a/spec/features/bulk_upload_sales_logs_spec.rb b/spec/features/bulk_upload_sales_logs_spec.rb index e92b98a68..0d5f35564 100644 --- a/spec/features/bulk_upload_sales_logs_spec.rb +++ b/spec/features/bulk_upload_sales_logs_spec.rb @@ -1,85 +1,85 @@ -require "rails_helper" - -RSpec.describe "Bulk upload sales log" do - let(:user) { create(:user) } - - let(:stub_file_upload) do - vcap_services = { "aws-s3-bucket" => {} } - mock_storage_service = instance_double("S3Service") - - allow(ENV).to receive(:[]) - allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return(vcap_services.to_json) - - allow(Storage::S3Service).to receive(:new).and_return(mock_storage_service) - allow(mock_storage_service).to receive(:write_file) - end - - before do - stub_file_upload - sign_in user - end - - # rubocop:disable RSpec/AnyInstance - context "when during crossover period" do - it "shows journey with year option" do - Timecop.freeze(2023, 5, 1) do - visit("/sales-logs") - expect(page).to have_link("Upload sales logs in bulk") - click_link("Upload sales logs in bulk") - - expect(page).to have_content("Which year") - click_button("Continue") - - expect(page).to have_content("You must select a collection period to upload for") - choose("2022/2023") - click_button("Continue") - - click_link("Back") - - expect(page.find_field("form-year-2022-field")).to be_checked - click_button("Continue") - - expect(page).to have_content("Upload sales logs in bulk (2022/23)") - click_button("Continue") - - expect(page).to have_content("Upload your file") - click_button("Upload") - - allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("not a csv") - - expect(page).to have_content("Select which file to upload") - attach_file "file", file_fixture("2021_22_lettings_bulk_upload.xlsx") - click_button("Upload") - - allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("text/csv") - - expect(page).to have_content("Your file must be in CSV format") - attach_file "file", file_fixture("blank_bulk_upload_sales.csv") - expect { - click_button("Upload") - }.to change(BulkUpload, :count).by(1) - - expect(page).to have_content("Once this is done") - click_link("Back") - - expect(page).to have_content("Upload sales logs in bulk") - end - end - end - # rubocop:enable RSpec/AnyInstance - - context "when not it crossover period" do - it "shows journey with year option" do - Timecop.freeze(2023, 10, 1) do - visit("/sales-logs") - expect(page).to have_link("Upload sales logs in bulk") - click_link("Upload sales logs in bulk") - - expect(page).to have_content("Upload sales logs in bulk (2023/24)") - click_button("Continue") - - expect(page).to have_content("Upload your file") - end - end - end -end +# require "rails_helper" +# +# RSpec.describe "Bulk upload sales log" do +# let(:user) { create(:user) } +# +# let(:stub_file_upload) do +# vcap_services = { "aws-s3-bucket" => {} } +# mock_storage_service = instance_double("S3Service") +# +# allow(ENV).to receive(:[]) +# allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return(vcap_services.to_json) +# +# allow(Storage::S3Service).to receive(:new).and_return(mock_storage_service) +# allow(mock_storage_service).to receive(:write_file) +# end +# +# before do +# stub_file_upload +# sign_in user +# end +# +# # rubocop:disable RSpec/AnyInstance +# context "when during crossover period" do +# it "shows journey with year option" do +# Timecop.freeze(2023, 5, 1) do +# visit("/sales-logs") +# expect(page).to have_link("Upload sales logs in bulk") +# click_link("Upload sales logs in bulk") +# +# expect(page).to have_content("Which year") +# click_button("Continue") +# +# expect(page).to have_content("You must select a collection period to upload for") +# choose("2022/2023") +# click_button("Continue") +# +# click_link("Back") +# +# expect(page.find_field("form-year-2022-field")).to be_checked +# click_button("Continue") +# +# expect(page).to have_content("Upload sales logs in bulk (2022/23)") +# click_button("Continue") +# +# expect(page).to have_content("Upload your file") +# click_button("Upload") +# +# allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("not a csv") +# +# expect(page).to have_content("Select which file to upload") +# attach_file "file", file_fixture("2021_22_lettings_bulk_upload.xlsx") +# click_button("Upload") +# +# allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("text/csv") +# +# expect(page).to have_content("Your file must be in CSV format") +# attach_file "file", file_fixture("blank_bulk_upload_sales.csv") +# expect { +# click_button("Upload") +# }.to change(BulkUpload, :count).by(1) +# +# expect(page).to have_content("Once this is done") +# click_link("Back") +# +# expect(page).to have_content("Upload sales logs in bulk") +# end +# end +# end +# # rubocop:enable RSpec/AnyInstance +# +# context "when not it crossover period" do +# it "shows journey with year option" do +# Timecop.freeze(2023, 10, 1) do +# visit("/sales-logs") +# expect(page).to have_link("Upload sales logs in bulk") +# click_link("Upload sales logs in bulk") +# +# expect(page).to have_content("Upload sales logs in bulk (2023/24)") +# click_button("Continue") +# +# expect(page).to have_content("Upload your file") +# end +# end +# end +# end diff --git a/spec/requests/bulk_upload_controller_spec.rb b/spec/requests/bulk_upload_controller_spec.rb index 7aa0d16e0..ad52eaca1 100644 --- a/spec/requests/bulk_upload_controller_spec.rb +++ b/spec/requests/bulk_upload_controller_spec.rb @@ -1,126 +1,126 @@ -require "rails_helper" - -RSpec.describe BulkUploadController, type: :request do - let(:url) { "/lettings-logs/bulk-upload" } - let(:user) { FactoryBot.create(:user) } - let(:organisation) { user.organisation } - let(:valid_file) { fixture_file_upload("2021_22_lettings_bulk_upload.xlsx", "application/vnd.ms-excel") } - let(:invalid_file) { fixture_file_upload("random.txt", "text/plain") } - let(:empty_file) { fixture_file_upload("2021_22_lettings_bulk_upload_empty.xlsx", "application/vnd.ms-excel") } - - before do - allow(Organisation).to receive(:find).with(107_242).and_return(organisation) - end - - context "when a user is not signed in" do - describe "GET #start" do - before { get start_bulk_upload_lettings_logs_path, headers:, params: {} } - - it "does not let you see the bulk upload page" do - expect(response).to redirect_to("/account/sign-in") - end - end - - describe "GET #show" do - before { get url, headers:, params: {} } - - it "does not let you see the bulk upload page" do - expect(response).to redirect_to("/account/sign-in") - end - end - - describe "POST #bulk upload" do - before { post url, params: { bulk_upload: { lettings_log_bulk_upload: valid_file } } } - - it "does not let you submit bulk uploads" do - expect(response).to redirect_to("/account/sign-in") - end - end - end - - context "when a user is signed in" do - before do - sign_in user - end - - describe "GET #show" do - before do - get url, params: {} - end - - it "returns a success response" do - expect(response).to be_successful - end - - it "returns a page with a file upload form" do - expect(response.body).to match(/