raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-10 03:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11872 from mkllnk/activate-background-reports

Browse Source 
Activate background report processing by default
This commit is contained in:
David Cook
2023-12-05 12:04:19 +11:00
committed by GitHub
parent cb5164ac6e 72755840c0
commit 685a1955bc
17 changed files with 135 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/reports_controller.rb
View File

@@ -26,6 +26,8 @@ module Admin
.enabled?(:background_reports, spree_current_user)
if @background_reports && request.post?
rendering_options # stores user preferences
return background(report_format)
end

7
db/migrate/20231129222807_enable_feature_backround_reports.rb Normal file
View File

@@ -0,0 +1,7 @@
# frozen_string_literal: true
class EnableFeatureBackroundReports < ActiveRecord::Migration[7.0]
def up
Flipper.enable("background_reports")
end
end

26
lib/open_food_network/feature_toggle.rb
View File

@@ -10,6 +10,17 @@ module OpenFoodNetwork
# Please add your new feature here to appear in the Flipper UI.
# We way move this to a YAML file when it becomes too awkward.
# **WARNING:** Features not in this list will be removed.
#
# Once the feature is ready for general production use,
# copy the feature declaration to ACTIVE_BY_DEFAULT below and
# activate it for all instances with a migration:
#
# ./bin/rails generate migration EnableFeatureDragonMode
#
# Replace the `change` method with an `up` method and add this line:
#
# Flipper.enable("dragon_mode")
#
CURRENT_FEATURES = {
"admin_style_v3" => <<~DESC,
Test the work-in-progress design updates.
@@ -38,10 +49,23 @@ module OpenFoodNetwork
DESC
}.freeze
# Features you would like to be enabled to start with.
#
# Copy features here that were activated in a migration so that new
# instances, development and test environments have the feature active.
ACTIVE_BY_DEFAULT = {
"background_reports" => <<~DESC,
Generate reports in a background process to limit memory consumption.
DESC
}.freeze
def self.setup!
CURRENT_FEATURES.each_key do |name|
feature = Flipper.feature(name)
feature.add unless feature.exist?
unless feature.exist?
feature.add
feature.enable if ACTIVE_BY_DEFAULT[name]
end
end
Flipper.features.each do |feature|

7
spec/base_spec_helper.rb
View File

@@ -88,6 +88,12 @@ RSpec.configure do |config|
expectations.syntax = :expect
end
# Reset all feature toggles to prevent leaking.
config.before(:suite) do
Flipper.features.each(&:remove)
OpenFoodNetwork::FeatureToggle.setup!
end
config.before(:each, :feature) do |example|
feature = example.metadata[:feature].to_s
@@ -230,4 +236,5 @@ RSpec.configure do |config|
config.include Features::DatepickerHelper, type: :system
config.include Features::TrixEditorHelper, type: :system
config.include DownloadsHelper, type: :system
config.include ReportsHelper, type: :system
end

4
spec/controllers/admin/reports_controller_spec.rb
View File

@@ -309,7 +309,7 @@ describe Admin::ReportsController, type: :controller do
controller_login_as_enterprise_user [coordinator1]
end
it 'renders the delivery report' do
it "triggers the delivery report" do
spree_post :show, {
q: { completed_at_lt: 1.day.ago },
shipping_method_in: ["123"], # We just need to search for shipping methods
@@ -317,7 +317,7 @@ describe Admin::ReportsController, type: :controller do
report_subtype: "delivery",
}
expect(response).to have_http_status(:ok)
expect(response).to have_http_status(:no_content)
end
end

10
spec/support/reports_helper.rb Normal file
View File

@@ -0,0 +1,10 @@
# frozen_string_literal: true
module ReportsHelper
def run_report
click_on "Go"
expect(page).to have_selector ".loading"
perform_enqueued_jobs(only: ReportJob)
expect(page).to have_no_selector ".loading"
end
end

6
spec/system/admin/reports/enterprise_fee_summaries_spec.rb
View File

@@ -94,6 +94,8 @@ describe "enterprise fee summaries" do
it "generates file with data for all enterprises" do
select "CSV"
click_on "Go"
perform_enqueued_jobs(only: ReportJob)
click_on "Download Report"
expect(downloaded_filename).to include ".csv"
expect(downloaded_content).to have_content(distributor.name)
end
@@ -117,6 +119,8 @@ describe "enterprise fee summaries" do
it "generates file with data for the enterprise" do
select "CSV"
click_on "Go"
perform_enqueued_jobs(only: ReportJob)
click_on "Download Report"
expect(downloaded_filename).to include ".csv"
expect(downloaded_content).to have_content(distributor.name)
@@ -151,6 +155,8 @@ describe "enterprise fee summaries" do
find("#report_format").click
select "CSV"
click_on "Go"
perform_enqueued_jobs(only: ReportJob)
click_on "Download Report"
expect(downloaded_filename).to include ".csv"
expect(downloaded_content).to have_content(distributor.name)

6
spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb
View File

@@ -163,8 +163,7 @@ describe "Enterprise Summary Fee with Tax Report By Order" do
visit admin_reports_path
click_on I18n.t("admin.reports.enterprise_fees_with_tax_report_by_order")
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
@@ -242,8 +241,7 @@ describe "Enterprise Summary Fee with Tax Report By Order" do
visit admin_reports_path
click_on I18n.t("admin.reports.enterprise_fees_with_tax_report_by_order")
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)

24
spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb
View File

@@ -277,7 +277,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
context "with line items from a single supplier" do
it 'generates the report and displays fees for the respective suppliers' do
visit_report
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
@@ -313,8 +313,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
page.find("#s2id_q_order_cycle_id_in").click
find('li', text: order_cycle.name).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
table = page.find("table.report__table tbody")
@@ -489,8 +488,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
page.find("#s2id_q_order_cycle_id_in").click
find('li', text: order_cycle3.name).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
table = page.find("table.report__table tbody")
@@ -520,8 +518,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
page.find("#s2id_supplier_id_in").click
find('li', text: supplier2.name).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
table = page.find("table.report__table tbody")
@@ -545,8 +542,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
page.find(fee_name_selector).click
find('li', text: supplier_fees.name).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
@@ -575,8 +571,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
page.find(fee_owner_selector).click
find('li', text: supplier.name).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
table = page.find("table.report__table tbody")
@@ -690,7 +685,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
context "with line items from a single supplier" do
it 'generates the report and displays fees for the respective suppliers' do
visit_report
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
@@ -828,7 +823,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
it 'should list all the tax rates' do
visit_report
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
@@ -923,7 +918,7 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
it 'should list all the tax rates' do
visit_report
click_on "Go"
run_report
expect(page.find("table.report__table thead tr")).to have_content(table_header)
@@ -951,6 +946,5 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
report_type: :enterprise_fee_summary,
report_subtype: :enterprise_fees_with_tax_report_by_producer
)
expect(page).to have_button("Go")
end
end

38
spec/system/admin/reports/orders_and_fulfillment_spec.rb
View File

@@ -53,7 +53,7 @@ describe "Orders And Fulfillment" do
end
it "displays the report" do
click_button 'Go'
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -104,7 +104,7 @@ describe "Orders And Fulfillment" do
end
it "correclty renders the report" do
click_button 'Go'
run_report
expect(page).to have_content "My Order Cycle"
end
end
@@ -127,20 +127,20 @@ describe "Orders And Fulfillment" do
pick_datetime "#q_completed_at_lt", datetime_end
find("#display_summary_row").set(false) # hides the summary rows
click_button 'Go'
run_report
# Then I should see the rows for the first order but not the second
# One row per line item - order1 only
expect(all('table.report__table tbody tr').count).to eq(2)
find("#display_summary_row").set(true) # displays the summary rows
click_button 'Go'
run_report
# Then I should see the rows for the first order but not the second
expect(all('table.report__table tbody tr').count).to eq(3)
# 2 rows for order1 + 1 summary row
# setting a time interval to include both orders
pick_datetime "#q_completed_at_gt", datetime_start2
click_button 'Go'
run_report
# Then I should see the rows for both orders
expect(all('table.report__table tbody tr').count).to eq(5)
# 2 rows for order1 + 1 summary row
@@ -168,7 +168,7 @@ describe "Orders And Fulfillment" do
end
it "orders the report by customer name, case insensitive" do
click_button 'Go'
run_report
rows = find("table.report__table tbody").all("tr.summary-row")
expect(rows[0]).to have_content "Dont Worry"
expect(rows[1]).to have_content "Chamois xaxa"
@@ -190,7 +190,7 @@ describe "Orders And Fulfillment" do
it "includes only selected product" do
tomselect_search_and_select(variant3.sku, from: "variant_id_in[]")
click_button 'Go'
run_report
rows = find("table.report__table").all("tbody tr")
table = rows.map { |r| r.all("td").map { |c| c.text.strip } }
@@ -225,7 +225,7 @@ describe "Orders And Fulfillment" do
describe "Totals" do
before do
click_link "Order Cycle Supplier Totals"
click_button 'Go'
run_report
end
context "with the header row option not selected" do
@@ -285,7 +285,7 @@ describe "Orders And Fulfillment" do
context "with the header row option selected" do
before do
find("#display_header_row").set(true) # displays the header row
click_button 'Go'
run_report
end
it "displays the report" do
@@ -319,7 +319,7 @@ describe "Orders And Fulfillment" do
context "with the header row option not selected" do
before do
find("#display_header_row").set(false) # hides the header row
click_button 'Go'
run_report
end
it "displays the report" do
@@ -369,7 +369,7 @@ describe "Orders And Fulfillment" do
context "with the header row option selected" do
before do
find("#display_header_row").set(true) # displays the header row
click_button 'Go'
run_report
end
it "displays the report" do
@@ -418,7 +418,7 @@ describe "Orders And Fulfillment" do
context "with the header row option not selected" do
before do
find("#display_header_row").set(false) # hides the header row
click_button 'Go'
run_report
end
it "displays the report" do
@@ -473,7 +473,7 @@ describe "Orders And Fulfillment" do
end
it "displays the report" do
click_button 'Go'
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -517,14 +517,14 @@ describe "Orders And Fulfillment" do
check 'Header Row'
uncheck 'Summary Row'
click_button 'Go'
run_report
click_link "Report"
click_link second_report_title
expect(page).to have_unchecked_field('Header Row')
expect(page).to have_checked_field('Summary Row')
check 'Header Row'
click_button 'Go'
run_report
# Step 2: check if report rendering options are saved properly
click_link "Report"
@@ -548,7 +548,7 @@ describe "Orders And Fulfillment" do
expect(page).to have_checked_field('Product')
uncheck('Producer')
uncheck('Product')
click_button 'Go'
run_report
click_link "Report"
click_link second_report_title
@@ -556,7 +556,7 @@ describe "Orders And Fulfillment" do
expect(page).to have_checked_field('Producer')
expect(page).to have_checked_field('Product')
uncheck('Product')
click_button 'Go'
run_report
# Step 2: check if report rendering options are saved properly
click_link "Report"
@@ -582,7 +582,7 @@ describe "Orders And Fulfillment" do
expect(page).to have_checked_field('Summary Row')
check 'Header Row'
uncheck 'Summary Row'
click_button 'Go'
run_report
logout
login_as(current_user)
@@ -602,7 +602,7 @@ describe "Orders And Fulfillment" do
expect(page).to have_checked_field('Product')
uncheck('Producer')
uncheck('Product')
click_button 'Go'
run_report
logout
login_as(current_user)

8
spec/system/admin/reports/packing_report_spec.rb
View File

@@ -55,7 +55,7 @@ describe "Packing Reports" do
# pre-fills with dates
check_prefilled_dates
click_button 'Go'
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -76,7 +76,7 @@ describe "Packing Reports" do
# pre-fills with dates
check_prefilled_dates
click_button 'Go'
run_report
rows = find("table.report__table").all("tr")
table = rows.map { |r| r.all("th,td").map { |c| c.text.strip }[3] }
expect(table).to eq([
@@ -102,7 +102,7 @@ describe "Packing Reports" do
find(:css, "#display_summary_row").set(false) # does not include summary rows
click_button 'Go'
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -150,7 +150,7 @@ describe "Packing Reports" do
# pre-fills with dates
check_prefilled_dates
find("button[type='submit']").click
run_report
expect(page).to have_content li1.product.name
expect(page).to have_content li2.product.name

4
spec/system/admin/reports/payments_report_spec.rb
View File

@@ -37,7 +37,7 @@ describe "Payments Reports" do
context "when choosing itemised payments report type" do
it "shows orders with payment state, their balance and totals" do
click_link "Itemised Payment Totals"
find("[type='submit']").click
run_report
expect(page.find("table.report__table thead tr").text).to have_content([
"Payment State",
@@ -72,7 +72,7 @@ describe "Payments Reports" do
it 'shows orders with payment state, their balance and and payment totals' do
click_link "Payment Totals"
find("[type='submit']").click
run_report
expect(page.find("table.report__table thead tr").text).to have_content([
"Payment State",

2
spec/system/admin/reports/revenues_by_hub_spec.rb
View File

@@ -27,7 +27,7 @@ describe "Revenues By Hub Reports" do
context "testing report" do
it "show the right values" do
find("[type='submit']").click
run_report
expect(page.find("table.report__table thead tr").text).to have_content([
"HUB",

20
spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb
View File

@@ -110,8 +110,7 @@ describe "Sales Tax Totals By order" do
visit admin_reports_path
click_on "Sales Tax Totals By Order"
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(page.find("table.report__table tbody").text).to have_content([
@@ -171,8 +170,7 @@ describe "Sales Tax Totals By order" do
visit_sales_tax_totals_by_order
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(page.find("table.report__table tbody").text).to have_content([
@@ -339,8 +337,7 @@ describe "Sales Tax Totals By order" do
end
it "should load all the orders" do
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(
@@ -365,8 +362,7 @@ describe "Sales Tax Totals By order" do
page.find(customer_email_dropdown_selector).click
find('li', text: customer1.email).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(
@@ -384,8 +380,7 @@ describe "Sales Tax Totals By order" do
page.find(customer_email_dropdown_selector).click
find('li', text: customer2.email).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(
@@ -404,7 +399,7 @@ describe "Sales Tax Totals By order" do
find('li', text: customer1.email).click
page.find(customer_email_dropdown_selector).click
find('li', text: customer2.email).click
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(
@@ -475,7 +470,8 @@ describe "Sales Tax Totals By order" do
end
def generate_report
click_on "Go"
run_report
click_on "Download Report"
wait_for_download
end

17
spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb
View File

@@ -79,8 +79,7 @@ describe "Sales Tax Totals By Producer" do
visit admin_reports_path
click_on 'Sales Tax Totals By Producer'
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(page.find("table.report__table tbody").text).to have_content([
@@ -140,8 +139,7 @@ describe "Sales Tax Totals By Producer" do
visit admin_reports_path
click_on 'Sales Tax Totals By Producer'
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(page.find("table.report__table tbody").text).to have_content([
@@ -329,8 +327,7 @@ describe "Sales Tax Totals By Producer" do
end
it "should load all the orders" do
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(page.find("table.report__table tbody").text).to have_content(state_tax_rate_row)
@@ -342,8 +339,7 @@ describe "Sales Tax Totals By Producer" do
page.find(customer_email_dropdown_selector).click
find('li', text: customer1.email).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(
@@ -359,8 +355,7 @@ describe "Sales Tax Totals By Producer" do
page.find(customer_email_dropdown_selector).click
find('li', text: customer2.email).click
expect(page).to have_button("Go")
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(
@@ -377,7 +372,7 @@ describe "Sales Tax Totals By Producer" do
find('li', text: customer1.email).click
page.find(customer_email_dropdown_selector).click
find('li', text: customer2.email).click
click_on "Go"
run_report
expect(page.find("table.report__table thead tr").text).to have_content(table_header)
expect(page.find("table.report__table tbody").text).to have_content(state_tax_rate_row)

2
spec/system/admin/reports/users_and_enterprises_spec.rb
View File

@@ -13,7 +13,7 @@ describe "Users & Enterprises reports" do
it "displays the report" do
enterprise = create(:supplier_enterprise)
click_button 'Go'
run_report
expect(page.find("table.report__table thead tr").text).to have_content([
"USER",

65
spec/system/admin/reports_spec.rb
View File

@@ -31,16 +31,7 @@ describe '
end
end
describe "Background processing", feature: :background_reports do
it "can run the customers report" do
login_as_admin
visit admin_report_path(report_type: :customers)
generate_report
expect(page).to have_selector "#report-table"
expect(page).to have_content "FIRST NAME LAST NAME BILLING ADDRESS EMAIL"
end
describe "Background processing" do
it "renders UTF-8 characters" do
# We had a problem when UTF-8 was in the page and the report because
# ActiveStorage read ASCII.
@@ -58,7 +49,7 @@ describe '
# Run the report:
login_as_admin
visit admin_report_path(report_type: :customers)
generate_report
run_report
expect(page).to have_content "Späti"
expect(page).to have_content "FIRST NAME LAST NAME BILLING ADDRESS EMAIL"
expect(page).to have_content "Müller"
@@ -69,7 +60,7 @@ describe '
visit admin_report_path(report_type: :customers)
stub_const("ReportJob::NOTIFICATION_TIME", 0)
generate_report
run_report
# We also get an email.
perform_enqueued_jobs(only: ActionMailer::MailDeliveryJob)
@@ -114,9 +105,9 @@ describe '
ReportJob.perform_now(**args)
breakpoint.synchronize { "continue after unlocked" }
end
click_button "Go"
expect(page).to have_selector "#report-table table"
click_on "Go"
expect(page).to have_content "FIRST NAME LAST NAME BILLING ADDRESS EMAIL"
# Now that we see the report, we need to make sure that it's not replaced
@@ -145,7 +136,7 @@ describe '
within "table.index" do
click_link "Customers"
end
click_button "Go"
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -165,7 +156,7 @@ describe '
it "payment method report" do
click_link "Payment Methods Report"
click_button "Go"
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
expect(table.sort).to eq([
@@ -176,7 +167,7 @@ describe '
it "delivery report" do
click_link "Delivery Report"
click_button "Go"
run_report
rows = find("table.report__table").all("thead tr")
table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
expect(table.sort).to eq([
@@ -197,7 +188,7 @@ describe '
it "generates the orders and distributors report" do
click_link 'Orders And Distributors'
click_button 'Go'
run_report
rows = find("table.report__table").all("thead tr")
table_headers = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -235,7 +226,7 @@ describe '
it "generates the payments reports" do
click_link 'Payments By Type'
click_button 'Go'
run_report
rows = find("table.report__table").all("thead tr")
table_headers = rows.map { |r| r.all("th").map { |c| c.text.strip } }
@@ -322,7 +313,7 @@ describe '
it "generate Tax Types reports" do
click_link "Tax Types"
click_button "Go"
run_report
# Then it should give me access only to managed enterprises
expect(page).to have_select 'q_distributor_id_eq',
@@ -332,7 +323,7 @@ describe '
# When I filter to just one distributor
select user1.enterprises.first.name, from: 'q_distributor_id_eq'
click_button 'Go'
run_report
# Then I should see the relevant order
expect(page).to have_content order1.number.to_s
@@ -353,7 +344,7 @@ describe '
it "generate Tax Rates report" do
click_link "Tax Rates"
click_button "Go"
run_report
expect(page).to have_css(".report__table thead th", text: "20.0% ($)")
expect(page).to have_css(".report__table thead th", text: "0.0% ($)")
@@ -396,7 +387,7 @@ describe '
expect(page).to have_content "All products"
expect(page).to have_content "Inventory (on hand)"
click_link 'All products'
click_button "Go"
run_report
expect(page).to have_content "Supplier"
expect(page).to have_table_row ["Supplier", "Producer Suburb", "Product",
"Product Properties", "Taxons", "Variant Value", "Price",
@@ -423,7 +414,7 @@ describe '
login_as_admin
visit admin_reports_path
click_link 'LettuceShare'
click_button "Go"
run_report
expect(page).to have_table_row ['PRODUCT', 'Description', 'Qty', 'Pack Size', 'Unit',
'Unit Price', 'Total', 'GST incl.',
@@ -448,7 +439,7 @@ describe '
end
it "shows users and enterprises report" do
click_button "Go"
run_report
rows = find("table.report__table").all("tr")
table = rows.map { |r| r.all("th,td").map { |c| c.text.strip }[0..2] }
@@ -469,7 +460,7 @@ describe '
select enterprise3.name, from: "enterprise_id_in"
select enterprise1.owner.email, from: "user_id_in"
click_button "Go"
run_report
rows = find("table.report__table").all("tr")
table = rows.map { |r| r.all("th,td").map { |c| c.text.strip }[0..2] }
@@ -489,7 +480,7 @@ describe '
it "generating Bulk Co-op Supplier Report" do
click_link "Bulk Co-op Supplier Report"
click_button "Go"
run_report
expect(page).to have_table_row [
"Supplier",
@@ -508,7 +499,7 @@ describe '
it "generating Bulk Co-op Allocation report" do
click_link "Bulk Co-op Allocation"
click_button "Go"
run_report
expect(page).to have_table_row [
"Customer",
@@ -527,7 +518,7 @@ describe '
it "generating Bulk Co-op Packing Sheets report" do
click_link "Bulk Co-op Packing Sheets"
click_button "Go"
run_report
expect(page).to have_table_row [
"Customer",
@@ -539,7 +530,7 @@ describe '
it "generating Bulk Co-op Customer Payments report" do
click_link "Bulk Co-op Customer Payments"
click_button "Go"
run_report
expect(page).to have_table_row [
"Customer",
@@ -652,7 +643,7 @@ describe '
login_as_admin
visit admin_reports_path
click_link "Summary"
click_button 'Go'
run_report
end
it "shows Xero invoices report" do
@@ -682,7 +673,7 @@ describe '
pick_datetime '#due_date', Date.new(2021, 3, 12)
fill_in 'account_code', with: 'abc123'
click_button 'Go'
run_report
opts = { invoice_number: '5', invoice_date: '2021-02-12',
due_date: '2021-03-12', account_code: 'abc123' }
@@ -712,7 +703,7 @@ describe '
login_as_admin
visit admin_reports_path
click_link "Detailed"
click_button 'Go'
run_report
opts = {}
@@ -780,12 +771,4 @@ describe '
'', 'N']
end
end
def generate_report
click_button "Go"
expect(page).to have_selector ".loading"
perform_enqueued_jobs(only: ReportJob)
expect(page).to have_no_selector ".loading"
expect(page).to have_selector "#report-table table"
end
end