Skip to content

Commit

Permalink
refs #1072
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Jurke committed Nov 12, 2014
1 parent 2af001a commit df2aaf5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/models/article/validations.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module Article::Validations
validates :transport_type2_price, :transport_type2_provider, presence: true, if: :transport_type2
validates :transport_type1_number, :transport_type2_number, numericality: { greater_than: 0 }
validates :transport_details, length: { maximum: 2500 }
validates :transport_time, length: { maximum: 7 }, format: { with: /\A\d{1,2}-?\d{,2}\z/ }, allow_blank: true
validates :transport_time, length: { maximum: 7 }, format: { with: /\A\d{1,2}[-–]?\d{,2}\z/ }, allow_blank: true

# payment

Expand Down
8 changes: 4 additions & 4 deletions test/fixtures/mass_upload_correct.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
€;id;title;categories;condition;condition_extra;content;quantity;price_cents;basic_price_cents;basic_price_amount;vat;external_title_image_url;image_2_url;transport_pickup;transport_type1;transport_type1_provider;transport_type1_price_cents;transport_type2;transport_type2_provider;transport_type2_price_cents;transport_details;payment_bank_transfer;payment_cash;payment_paypal;payment_cash_on_delivery;payment_cash_on_delivery_price_cents;payment_invoice;payment_details;fair_kind;fair_seal;support;support_checkboxes;support_other;support_explanation;labor_conditions;labor_conditions_checkboxes;labor_conditions_other;labor_conditions_explanation;environment_protection;environment_protection_checkboxes;environment_protection_other;environment_protection_explanation;controlling;controlling_checkboxes;controlling_other;controlling_explanation;awareness_raising;awareness_raising_checkboxes;awareness_raising_other;awareness_raising_explanation;nonprofit_association;nonprofit_association_checkboxes;social_businesses_muhammad_yunus;social_businesses_muhammad_yunus_checkboxes;social_entrepreneur;social_entrepreneur_checkboxes;social_entrepreneur_explanation;ecologic_seal;upcycling_reason;small_and_precious_eu_small_enterprise;small_and_precious_reason;small_and_precious_handmade;gtin;custom_seller_identifier;action
;;Name von Artikel 1;3,8;old;used_good;Dummybeschreibung mit mehreren Woertern;1;120;100;kilogram;0;;;true;true;DHL;140;true;Hermes;170;Weitere Angaben zum Versand (ganz individuell);true;true;false;true;120;false;Und das sind die Zahlungsdetails;fair_trust;;true;prefinance,longterm,other;sonstiges marginalisiert;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;secure_environment,hygiene,working_hours,free_assembly,other;labor condition sonstiges;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;chemical_fertilizers,pesticides;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;transparent_supply_chain,annual_reports;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;producer_transparency;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;;;;;;;;;;true;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;123456789123;;
;;Name von Artikel 2;4;new;;Dummybeschreibung mit mehreren Woertern;3;10000;;milliliter;7;;;true;;;;;;;Weitere Angaben zum Versand (ganz individuell);true;true;true;true;120;true;Und das sind die Zahlungsdetails;social_producer;;;;;;;;;;;;;;;;;;;;;;true;charity,national_and_vocational_training;true;social_proplem,dividend;true;small_social_groups;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;;;;;123Geheimzeichen!@#$%^&*([]}{;
;;Name von Artikel 3;5;new;;Dummybeschreibung mit mehreren Woertern;1;300000;;milliliter;19;;;true;;;;;;;Weitere Angaben zum Versand (ganz individuell);true;true;true;true;120;true;Und das sind die Zahlungsdetails;social_producer;;;;;;;;;;;;;;;;;;;;;;true;charity,national_and_vocational_training;true;social_proplem,dividend;true;small_social_groups;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;deutsches_gueteband_wein;;;;;;Geheimzeichen;
€;id;title;categories;condition;condition_extra;content;quantity;price_cents;basic_price_cents;basic_price_amount;vat;external_title_image_url;image_2_url;transport_pickup;transport_type1;transport_type1_provider;transport_type1_price_cents;transport_type2;transport_type2_provider;transport_type2_price_cents;transport_time;transport_details;payment_bank_transfer;payment_cash;payment_paypal;payment_cash_on_delivery;payment_cash_on_delivery_price_cents;payment_invoice;payment_details;fair_kind;fair_seal;support;support_checkboxes;support_other;support_explanation;labor_conditions;labor_conditions_checkboxes;labor_conditions_other;labor_conditions_explanation;environment_protection;environment_protection_checkboxes;environment_protection_other;environment_protection_explanation;controlling;controlling_checkboxes;controlling_other;controlling_explanation;awareness_raising;awareness_raising_checkboxes;awareness_raising_other;awareness_raising_explanation;nonprofit_association;nonprofit_association_checkboxes;social_businesses_muhammad_yunus;social_businesses_muhammad_yunus_checkboxes;social_entrepreneur;social_entrepreneur_checkboxes;social_entrepreneur_explanation;ecologic_seal;upcycling_reason;small_and_precious_eu_small_enterprise;small_and_precious_reason;small_and_precious_handmade;gtin;custom_seller_identifier;action
;;Name von Artikel 1;3,8;old;used_good;Dummybeschreibung mit mehreren Woertern;1;120;100;kilogram;0;;;true;true;DHL;140;true;Hermes;170;3;Weitere Angaben zum Versand (ganz individuell);true;true;false;true;120;false;Und das sind die Zahlungsdetails;fair_trust;;true;prefinance,longterm,other;sonstiges marginalisiert;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;secure_environment,hygiene,working_hours,free_assembly,other;labor condition sonstiges;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;chemical_fertilizers,pesticides;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;transparent_supply_chain,annual_reports;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;producer_transparency;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;;;;;;;;;;true;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;true;123456789123;;
;;Name von Artikel 2;4;new;;Dummybeschreibung mit mehreren Woertern;3;10000;;milliliter;7;;;true;;;;;;;3 – 5;Weitere Angaben zum Versand (ganz individuell);true;true;true;true;120;true;Und das sind die Zahlungsdetails;social_producer;;;;;;;;;;;;;;;;;;;;;;true;charity,national_and_vocational_training;true;social_proplem,dividend;true;small_social_groups;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;;;;;123Geheimzeichen!@#$%^&*([]}{;
;;Name von Artikel 3;5;new;;Dummybeschreibung mit mehreren Woertern;1;300000;;milliliter;19;;;true;;;;;;;;Weitere Angaben zum Versand (ganz individuell);true;true;true;true;120;true;Und das sind die Zahlungsdetails;social_producer;;;;;;;;;;;;;;;;;;;;;;true;charity,national_and_vocational_training;true;social_proplem,dividend;true;small_social_groups;Muss mindestens 150 Zeichen lang sein aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa;deutsches_gueteband_wein;;;;;;Geheimzeichen;
7 changes: 7 additions & 0 deletions test/models/article_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
it { subject.must_respond_to :transport_type2_provider }
it { subject.must_respond_to :transport_type1_price_cents }
it { subject.must_respond_to :transport_type2_price_cents }
it { subject.must_respond_to :transport_time }
it { subject.must_respond_to :payment_bank_transfer }
it { subject.must_respond_to :payment_cash }
it { subject.must_respond_to :payment_paypal }
Expand Down Expand Up @@ -226,6 +227,12 @@
db_article.errors[:payment_paypal].must_equal [I18n.t("article.form.errors.paypal_details_missing")]
end

it "should allow dashes in transport_time" do
db_article.transport_time = "3 – 5"
db_article.save
db_article.errors[:transport_time].must_equal []
end

it {subject.must validate_numericality_of(:transport_type1_number)}
it {subject.must validate_numericality_of(:transport_type2_number)}
end
Expand Down

0 comments on commit df2aaf5

Please sign in to comment.