raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure non-distributors are listed in dashboard

Browse Source 
We want to show all enterprises in a single list regardless of their
type.
This commit is contained in:
Pau Perez
2018-05-22 10:09:24 +02:00
parent bd34f27ace
commit 208e3bbadd
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/spree/admin/overview/_enterprises.html.haml
View File

@@ -25,7 +25,7 @@
%span.centered.three.columns
= t "spree_admin_enterprises_fees"
%div.sixteen.columns.alpha.list
- @enterprises.is_distributor.each do |enterprise|
- @enterprises.each do |enterprise|
%a.sixteen.columns.alpha.list-item{ class: "#{cycle('odd','even')}", href: "#{main_app.edit_admin_enterprise_path(enterprise)}" }
%span.five.columns.alpha
= enterprise.name

17
spec/features/admin/overview_spec.rb
View File

@@ -56,19 +56,24 @@ feature %q{
context "with multiple enterprises" do
let(:d1) { create(:distributor_enterprise) }
let(:d2) { create(:distributor_enterprise) }
let(:non_distributor_enterprise) { create(:enterprise, sells: 'none') }
before :each do
before do
@enterprise_user.enterprise_roles.build(enterprise: d1).save
@enterprise_user.enterprise_roles.build(enterprise: d2).save
@enterprise_user
.enterprise_roles.build(enterprise: non_distributor_enterprise).save
end
it "displays information about the enterprise" do
visit '/admin'
page.should have_selector ".dashboard_item#enterprises h3", text: "My Enterprises"
page.should have_selector ".dashboard_item#products"
page.should have_selector ".dashboard_item#order_cycles"
page.should have_selector ".dashboard_item#enterprises .list-item", text: d1.name
page.should have_selector ".dashboard_item#enterprises .button.bottom", text: "MANAGE MY ENTERPRISES"
expect(page).to have_selector ".dashboard_item#enterprises h3", text: "My Enterprises"
expect(page).to have_selector ".dashboard_item#products"
expect(page).to have_selector ".dashboard_item#order_cycles"
expect(page).to have_selector ".dashboard_item#enterprises .list-item", text: d1.name
expect(page).to have_selector ".dashboard_item#enterprises .list-item", text: non_distributor_enterprise.name
expect(page).to have_selector ".dashboard_item#enterprises .button.bottom", text: "MANAGE MY ENTERPRISES"
end
context "but no products or order cycles" do