Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

chore: rubocop

Browse source 
chore: fix api test conventions

chore: rubocop -A spec/

chore: more rubocop -A

fix failing test

rubocop fixes

removes helper methods that are in my opinion dead code

more rubocop fixes

rubocop -a --auto-gen-config
This commit is contained in:
Philipp Rothmann 2023-05-12 13:01:12 +02:00 • committed by Philipp Rothmann
parent f6fb804bbe
commit fb2b4d8a8a
331 changed files with 4263 additions and 4507 deletions
Download patch file Download diff file Expand all files Collapse all files

46
spec/integration/articles_spec.rb
View file

@ -1,9 +1,9 @@
require_relative '../spec_helper'
feature ArticlesController do
let(:user) { create :user, groups: [create(:workgroup, role_article_meta: true)] }
let(:supplier) { create :supplier }
let!(:article_category) { create :article_category }
let(:user) { create(:user, groups: [create(:workgroup, role_article_meta: true)]) }
let(:supplier) { create(:supplier) }
let!(:article_category) { create(:article_category) }
before { login user }
@ -18,15 +18,15 @@ feature ArticlesController do
it 'can create a new article' do
click_on I18n.t('articles.index.new')
expect(page).to have_selector('form#new_article')
article = build :article, supplier: supplier, article_category: article_category
article = build(:article, supplier: supplier, article_category: article_category)
within('#new_article') do
fill_in 'article_name', :with => article.name
fill_in 'article_unit', :with => article.unit
select article.article_category.name, :from => 'article_article_category_id'
fill_in 'article_price', :with => article.price
fill_in 'article_unit_quantity', :with => article.unit_quantity
fill_in 'article_tax', :with => article.tax
fill_in 'article_deposit', :with => article.deposit
fill_in 'article_name', with: article.name
fill_in 'article_unit', with: article.unit
select article.article_category.name, from: 'article_article_category_id'
fill_in 'article_price', with: article.price
fill_in 'article_unit_quantity', with: article.unit_quantity
fill_in 'article_tax', with: article.tax
fill_in 'article_deposit', with: article.deposit
# "Element cannot be scrolled into view" error, js as workaround
# find('input[type="submit"]').click
page.execute_script('$("form#new_article").submit();')
@ -50,22 +50,22 @@ feature ArticlesController do
it do
find('input[type="submit"]').click
expect(find("tr:nth-child(1) #new_articles__note").value).to eq "bio ◎"
expect(find("tr:nth-child(2) #new_articles__name").value).to eq "Pijnboompitten"
expect(find('tr:nth-child(1) #new_articles__note').value).to eq 'bio ◎'
expect(find('tr:nth-child(2) #new_articles__name').value).to eq 'Pijnboompitten'
4.times do |i|
all("tr:nth-child(#{i + 1}) select > option")[1].select_option
end
find('input[type="submit"]').click
expect(page).to have_content("Pijnboompitten")
expect(page).to have_content('Pijnboompitten')
expect(supplier.articles.count).to eq 4
end
end
end
describe "can update existing article" do
let!(:article) { create :article, supplier: supplier, name: 'Foobar', order_number: 1, unit: '250 g' }
describe 'can update existing article' do
let!(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 1, unit: '250 g') }
it do
find('input[type="submit"]').click
@ -77,35 +77,35 @@ feature ArticlesController do
end
end
describe "handles missing data" do
describe 'handles missing data' do
it do
find('input[type="submit"]').click # to overview
find('input[type="submit"]').click # missing category, re-show form
expect(find('tr.alert')).to be_present
expect(supplier.articles.count).to eq 0
all("tr select > option")[1].select_option
all('tr select > option')[1].select_option
find('input[type="submit"]').click # now it should succeed
expect(supplier.articles.count).to eq 1
end
end
describe "can remove an existing article" do
let!(:article) { create :article, supplier: supplier, name: 'Foobar', order_number: 99999 }
describe 'can remove an existing article' do
let!(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 99_999) }
it do
check('articles_outlist_absent')
find('input[type="submit"]').click
expect(find("#outlisted_articles_#{article.id}", visible: :all)).to be_present
all("tr select > option")[1].select_option
all('tr select > option')[1].select_option
find('input[type="submit"]').click
expect(article.reload.deleted?).to be true
end
end
describe "can convert units when updating" do
let!(:article) { create :article, supplier: supplier, order_number: 1, unit: '250 g' }
describe 'can convert units when updating' do
let!(:article) { create(:article, supplier: supplier, order_number: 1, unit: '250 g') }
it do
check('articles_convert_units')

49
spec/integration/balancing_spec.rb
View file

@ -1,17 +1,17 @@
require_relative '../spec_helper'
feature 'settling an order', js: true do
let(:ftt) { create :financial_transaction_type }
let(:admin) { create :user, groups: [create(:workgroup, role_finance: true)] }
let(:user) { create :user, groups: [create(:ordergroup)] }
let(:supplier) { create :supplier }
let(:article) { create :article, supplier: supplier, unit_quantity: 1 }
let(:order) { create :order, supplier: supplier, article_ids: [article.id] } # need to ref article
let(:go1) { create :group_order, order: order }
let(:go2) { create :group_order, order: order }
let(:ftt) { create(:financial_transaction_type) }
let(:admin) { create(:user, groups: [create(:workgroup, role_finance: true)]) }
let(:user) { create(:user, groups: [create(:ordergroup)]) }
let(:supplier) { create(:supplier) }
let(:article) { create(:article, supplier: supplier, unit_quantity: 1) }
let(:order) { create(:order, supplier: supplier, article_ids: [article.id]) } # need to ref article
let(:go1) { create(:group_order, order: order) }
let(:go2) { create(:group_order, order: order) }
let(:oa) { order.order_articles.find_by_article_id(article.id) }
let(:goa1) { create :group_order_article, group_order: go1, order_article: oa }
let(:goa2) { create :group_order_article, group_order: go2, order_article: oa }
let(:goa1) { create(:group_order_article, group_order: go1, order_article: oa) }
let(:goa2) { create(:group_order_article, group_order: go2, order_article: oa) }
before do
goa1.update_quantities(3, 0)
@ -22,6 +22,9 @@ feature 'settling an order', js: true do
goa2.reload
end
before { visit new_finance_order_path(order_id: order.id) }
before { login admin }
it 'has correct order result' do
expect(oa.quantity).to eq(4)
expect(oa.tolerance).to eq(0)
@ -29,10 +32,6 @@ feature 'settling an order', js: true do
expect(goa2.result).to eq(1)
end
before { login admin }
before { visit new_finance_order_path(order_id: order.id) }
it 'has product ordered visible' do
expect(page).to have_content(article.name)
expect(page).to have_selector("#order_article_#{oa.id}")
@ -59,7 +58,7 @@ feature 'settling an order', js: true do
click_link I18n.t('ui.delete')
end
end
expect(page).to_not have_selector("#order_article_#{oa.id}")
expect(page).not_to have_selector("#order_article_#{oa.id}")
expect(OrderArticle.exists?(oa.id)).to be true
oa.reload
expect(oa.quantity).to eq(4)
@ -77,7 +76,7 @@ feature 'settling an order', js: true do
click_link I18n.t('ui.delete')
end
end
expect(page).to_not have_selector("#order_article_#{oa.id}")
expect(page).not_to have_selector("#order_article_#{oa.id}")
expect(OrderArticle.exists?(oa.id)).to be false
end
@ -87,7 +86,7 @@ feature 'settling an order', js: true do
within("#group_order_article_#{goa1.id}") do
click_link I18n.t('ui.delete')
end
expect(page).to_not have_selector("#group_order_article_#{goa1.id}")
expect(page).not_to have_selector("#group_order_article_#{goa1.id}")
expect(OrderArticle.exists?(oa.id)).to be true
expect(GroupOrderArticle.exists?(goa1.id)).to be true
goa1.reload
@ -103,7 +102,7 @@ feature 'settling an order', js: true do
within("#group_order_article_#{goa1.id}") do
click_link I18n.t('ui.delete')
end
expect(page).to_not have_selector("#group_order_article_#{goa1.id}")
expect(page).not_to have_selector("#group_order_article_#{goa1.id}")
expect(OrderArticle.exists?(oa.id)).to be true
expect(GroupOrderArticle.exists?(goa1.id)).to be false
end
@ -134,15 +133,15 @@ feature 'settling an order', js: true do
end
expect(page).to have_selector('form#new_group_order_article')
within('#new_group_order_article') do
select user.ordergroup.name, :from => 'group_order_article_ordergroup_id'
select user.ordergroup.name, from: 'group_order_article_ordergroup_id'
find_by_id('group_order_article_result').set(8)
sleep 0.25
find('input[type="submit"]').click
end
expect(page).to_not have_selector('form#new_group_order_article')
expect(page).not_to have_selector('form#new_group_order_article')
expect(page).to have_content(user.ordergroup.name)
goa = GroupOrderArticle.last
expect(goa).to_not be_nil
expect(goa).not_to be_nil
expect(goa.result).to eq 8
expect(page).to have_selector("#group_order_article_#{goa.id}")
expect(find("#r_#{goa.id}").value.to_f).to eq 8
@ -169,8 +168,8 @@ feature 'settling an order', js: true do
end
it 'can add an article' do
new_article = create :article, supplier: supplier
expect(page).to_not have_content(new_article.name)
new_article = create(:article, supplier: supplier)
expect(page).not_to have_content(new_article.name)
click_link I18n.t('finance.balancing.edit_results_by_articles.add_article')
expect(page).to have_selector('form#new_order_article')
within('#new_order_article') do
@ -178,8 +177,8 @@ feature 'settling an order', js: true do
sleep 0.25
find('input[type="submit"]').click
end
expect(page).to_not have_selector('form#new_order_article')
expect(page).not_to have_selector('form#new_order_article')
expect(page).to have_content(new_article.name)
expect(order.order_articles.where(article_id: new_article.id)).to_not be_nil
expect(order.order_articles.where(article_id: new_article.id)).not_to be_nil
end
end

8
spec/integration/config_spec.rb
View file

@ -3,7 +3,7 @@ require_relative '../spec_helper'
feature 'admin/configs' do
let(:name) { Faker::Lorem.words(number: rand(2..4)).join(' ') }
let(:email) { Faker::Internet.email }
let(:admin) { create :admin }
let(:admin) { create(:admin) }
before { login admin }
@ -51,13 +51,13 @@ feature 'admin/configs' do
end
def compact_hash_deep!(h)
h.each do |k, v|
h.each do |_k, v|
if v.is_a? Hash
compact_hash_deep!(v)
v.reject! { |k, v| v.blank? }
v.compact_blank!
end
end
h.reject! { |k, v| v.blank? }
h.compact_blank!
h
end
end

2
spec/integration/home_spec.rb
View file

@ -1,7 +1,7 @@
require_relative '../spec_helper'
feature 'my profile page' do
let(:user) { create :user }
let(:user) { create(:user) }
before { login user }

4
spec/integration/login_spec.rb
View file

@ -1,7 +1,7 @@
require_relative '../spec_helper'
feature LoginController do
let(:user) { create :user }
let(:user) { create(:user) }
describe 'forgot password' do
before { visit forgot_password_path }
@ -36,7 +36,7 @@ feature LoginController do
it 'is not accessible' do
expect(page).to have_selector '.alert-error'
expect(page).to_not have_selector 'input[type=password]'
expect(page).not_to have_selector 'input[type=password]'
end
end

10
spec/integration/order_spec.rb
View file

@ -1,12 +1,12 @@
require_relative '../spec_helper'
feature Order, js: true do
let(:admin) { create :user, groups: [create(:workgroup, role_orders: true)] }
let(:article) { create :article, unit_quantity: 1 }
let(:order) { create :order, supplier: article.supplier, article_ids: [article.id] } # need to ref article
let(:go1) { create :group_order, order: order }
let(:admin) { create(:user, groups: [create(:workgroup, role_orders: true)]) }
let(:article) { create(:article, unit_quantity: 1) }
let(:order) { create(:order, supplier: article.supplier, article_ids: [article.id]) } # need to ref article
let(:go1) { create(:group_order, order: order) }
let(:oa) { order.order_articles.find_by_article_id(article.id) }
let(:goa1) { create :group_order_article, group_order: go1, order_article: oa }
let(:goa1) { create(:group_order_article, group_order: go1, order_article: oa) }
before { login admin }

16
spec/integration/product_distribution_example_spec.rb
View file

@ -1,12 +1,12 @@
require_relative '../spec_helper'
feature 'product distribution', js: true do
let(:ftt) { create :financial_transaction_type }
let(:admin) { create :admin }
let(:user_a) { create :user, groups: [create(:ordergroup)] }
let(:user_b) { create :user, groups: [create(:ordergroup)] }
let(:supplier) { create :supplier }
let(:article) { create :article, supplier: supplier, unit_quantity: 5 }
let(:ftt) { create(:financial_transaction_type) }
let(:admin) { create(:admin) }
let(:user_a) { create(:user, groups: [create(:ordergroup)]) }
let(:user_b) { create(:user, groups: [create(:ordergroup)]) }
let(:supplier) { create(:supplier) }
let(:article) { create(:article, supplier: supplier, unit_quantity: 5) }
let(:order) { create(:order, supplier: supplier, article_ids: [article.id]) }
let(:oa) { order.order_articles.first }
@ -50,10 +50,10 @@ feature 'product distribution', js: true do
expect(oa.quantity).to eq(6)
expect(oa.tolerance).to eq(1)
# Gruppe a bekommt 3 einheiten.
goa_a = oa.group_order_articles.joins(:group_order).where(:group_orders => { :ordergroup_id => user_a.ordergroup.id }).first
goa_a = oa.group_order_articles.joins(:group_order).where(group_orders: { ordergroup_id: user_a.ordergroup.id }).first
expect(goa_a.result).to eq(3)
# gruppe b bekommt 2 einheiten.
goa_b = oa.group_order_articles.joins(:group_order).where(:group_orders => { :ordergroup_id => user_b.ordergroup.id }).first
goa_b = oa.group_order_articles.joins(:group_order).where(group_orders: { ordergroup_id: user_b.ordergroup.id }).first
expect(goa_b.result).to eq(2)
end
end

24
spec/integration/receive_spec.rb
View file

@ -1,15 +1,15 @@
require_relative '../spec_helper'
feature 'receiving an order', js: true do
let(:admin) { create :user, groups: [create(:workgroup, role_orders: true)] }
let(:supplier) { create :supplier }
let(:article) { create :article, supplier: supplier, unit_quantity: 3 }
let(:order) { create :order, supplier: supplier, article_ids: [article.id] } # need to ref article
let(:go1) { create :group_order, order: order }
let(:go2) { create :group_order, order: order }
let(:admin) { create(:user, groups: [create(:workgroup, role_orders: true)]) }
let(:supplier) { create(:supplier) }
let(:article) { create(:article, supplier: supplier, unit_quantity: 3) }
let(:order) { create(:order, supplier: supplier, article_ids: [article.id]) } # need to ref article
let(:go1) { create(:group_order, order: order) }
let(:go2) { create(:group_order, order: order) }
let(:oa) { order.order_articles.find_by_article_id(article.id) }
let(:goa1) { create :group_order_article, group_order: go1, order_article: oa }
let(:goa2) { create :group_order_article, group_order: go2, order_article: oa }
let(:goa1) { create(:group_order_article, group_order: go1, order_article: oa) }
let(:goa2) { create(:group_order_article, group_order: go2, order_article: oa) }
# set quantities of group_order_articles
def set_quantities(q1, q2)
@ -46,7 +46,7 @@ feature 'receiving an order', js: true do
it 'has product not ordered invisible' do
set_quantities [0, 0], [0, 0]
visit receive_order_path(id: order.id)
expect(page).to_not have_selector("#order_article_#{oa.id}")
expect(page).not_to have_selector("#order_article_#{oa.id}")
end
it 'is not received by default' do
@ -58,7 +58,7 @@ feature 'receiving an order', js: true do
it 'does not change anything when received is ordered' do
set_quantities [2, 0], [3, 2]
visit receive_order_path(id: order.id)
fill_in "order_articles_#{oa.id}_units_received", :with => oa.units_to_order
fill_in "order_articles_#{oa.id}_units_received", with: oa.units_to_order
find('input[type="submit"]').click
expect(page).to have_selector('body')
check_quantities 2, 2, 4
@ -67,7 +67,7 @@ feature 'receiving an order', js: true do
it 'redistributes properly when received is more' do
set_quantities [2, 0], [3, 2]
visit receive_order_path(id: order.id)
fill_in "order_articles_#{oa.id}_units_received", :with => 3
fill_in "order_articles_#{oa.id}_units_received", with: 3
find('input[type="submit"]').click
expect(page).to have_selector('body')
check_quantities 3, 2, 5
@ -76,7 +76,7 @@ feature 'receiving an order', js: true do
it 'redistributes properly when received is less' do
set_quantities [2, 0], [3, 2]
visit receive_order_path(id: order.id)
fill_in "order_articles_#{oa.id}_units_received", :with => 1
fill_in "order_articles_#{oa.id}_units_received", with: 1
find('input[type="submit"]').click
expect(page).to have_selector('body')
check_quantities 1, 2, 1

10
spec/integration/session_spec.rb
View file

@ -1,7 +1,7 @@
require_relative '../spec_helper'
feature 'the session' do
let(:user) { create :user }
let(:user) { create(:user) }
describe 'login page' do
it 'is accessible' do
@ -11,7 +11,7 @@ feature 'the session' do
it 'logs me in' do
login user
expect(page).to_not have_selector('.alert-error')
expect(page).not_to have_selector('.alert-error')
end
it 'does not log me in with wrong password' do
@ -21,10 +21,10 @@ feature 'the session' do
it 'can log me in using an email address' do
visit login_path
fill_in 'nick', :with => user.email
fill_in 'password', :with => user.password
fill_in 'nick', with: user.email
fill_in 'password', with: user.password
find('input[type=submit]').click
expect(page).to_not have_selector('.alert-error')
expect(page).not_to have_selector('.alert-error')
end
end
end

16
spec/integration/supplier_spec.rb
View file

@ -1,20 +1,20 @@
require_relative '../spec_helper'
feature 'supplier' do
let(:supplier) { create :supplier }
let(:user) { create :user, :role_suppliers }
let(:supplier) { create(:supplier) }
let(:user) { create(:user, :role_suppliers) }
before { login user }
describe 'create new' do
it 'can be created' do
create :supplier_category
create(:supplier_category)
visit new_supplier_path
supplier = build :supplier
supplier = build(:supplier)
within('#new_supplier') do
fill_in 'supplier_name', :with => supplier.name
fill_in 'supplier_address', :with => supplier.address
fill_in 'supplier_phone', :with => supplier.phone
fill_in 'supplier_name', with: supplier.name
fill_in 'supplier_address', with: supplier.address
fill_in 'supplier_phone', with: supplier.phone
find('input[type="submit"]').click
end
expect(page).to have_content(supplier.name)
@ -38,7 +38,7 @@ feature 'supplier' do
end
it 'can be updated' do
new_supplier = build :supplier
new_supplier = build(:supplier)
supplier
visit edit_supplier_path(id: supplier.id)
fill_in 'supplier_name', with: new_supplier.name