raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,769 Commits 18 Branches 451 Tags
bef3f154d65e91c7571e1ce411fb596ddbf7df65
Commit Graph

1322 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
798cd9e778 Merge pull request #4114 from kristinalim/fix/4103-add_specs 
4103 Add specs for referencing of shipments to deleted variants
 2019-08-07 12:52:11 +02:00
Kristina Lim
cd81dfaead Move deleted variant to let block in feature spec 2019-08-02 21:52:36 +08:00
Kristina Lim
25073ada84 Move order to a let block in feature spec 2019-08-02 21:52:33 +08:00
Kristina Lim
15b6f9dd5e Add specs testing edit order page still okay when variant deleted 
Note that the wrapping example group also loads the edit order page
before this "before" block. This will be fixed in the next commit.
 2019-08-02 21:45:39 +08:00
luisramos0
9400516b56 Fix broken (was always green) bulk_product_update_spec updating image spec where the old src url was not stored and the expect command was wrong with != 2019-07-30 20:37:26 +01:00
Luis Ramos
340b92e580 Merge pull request #3700 from luisramos0/2-0-without-auth-devise 
Remove dependency to spree_auth_devise
 2019-07-26 10:57:38 +01:00
luisramos0
f2ac354e00 Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it 2019-07-18 14:29:38 +01:00
luisramos0
71b648e9fa Add some tests to features/admin/users_spec from spree_auth_devise 2019-07-12 10:02:40 +01:00
luisramos0
eacd76bfa4 Add spec to features/admin/products_spec from spre_auth_devise 2019-07-11 19:47:17 +01:00
Matt-Yorkley
b2c6e6271c LineItems can always access soft-deleted variants 2019-07-11 11:33:34 +01:00
Luis Ramos
23b6267e30 Merge pull request #3916 from luisramos0/schedules_of_coordinator 
OC schedules are now filtered to schedules of OCs with same coordinator
 2019-07-09 14:21:34 +01:00
Maikel
592a468448 Merge pull request #3960 from mkllnk/test-spec-stability 
Remove retries from previously flaky specs
 2019-07-02 13:50:16 +10:00
Maikel
4c4881430c Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import 
3877,3843 Improve handling of units and unit type in product import
 2019-06-21 14:43:01 +10:00
Maikel Linke
cccd35fdf3 Remove retries from previously flaky specs 
It's not acceptable to have flaky specs that only pass once in three
tries. Our specs might be more stable now that we use Chrome as test
browser. Otherwise we have to find out why these specs are not stable.
It might be an important bug that happens only sometimes.
 2019-06-19 16:48:04 +10:00
Maikel Linke
ac79e44d9a Fix current rubocop violations 2019-06-14 11:40:09 +10:00
Luis Ramos
e15ccdbd74 Merge pull request #3840 from mkllnk/3727-default-credit-cards 
Make only reusable credit cards the default card
 2019-06-13 14:13:32 +01:00
Luis Ramos
1a2703f630 Merge pull request #3886 from luisramos0/fees_translations 
Make a few more things translatable in the Enterprise Fees management page
 2019-06-13 14:12:16 +01:00
luisramos0
6cf705ea55 In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id. 2019-06-11 21:28:52 +01:00
Maikel Linke
5c72c35060 Use better credit card factory for subs specs 
The specs for subscriptions were creating simple one-time-use credit
cards. They should not be used for subscriptions. After this was fixed
in previous commits, these integration tests failed. Now we use a new
factory that mimics stored credit cards that can be used for
subscriptions.
 2019-06-11 18:01:41 +01:00
Kristina Lim
70614de955 Require product import rows to match unit of preceding rows 2019-06-10 04:20:03 +08:00
Luis Ramos
568e3003ba Merge pull request #3882 from kristinalim/feature/3408-enable_enterprise_fee_summary_for_non_superadmin 
3408 Remove feature flag for Enterprise Fee Summary
 2019-06-06 16:28:36 +01:00
luisramos0
1d4529092f Make fee type options in enterprise fees page translatable 2019-05-30 00:46:20 +01:00
Kristina Lim
ecea0600b6 Remove feature flag for Enterprise Fee Summary 2019-05-29 02:50:41 +08:00
luisramos0
7397ab4fd8 Run transpec in spec/features/admin/payment_method_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
ec7e92202b Run transpec in spec/features/admin/enterprise_user_spec.rb and spec/features/admin/overview_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
9a21ca38e1 Run transpec in a few more spec/features/admin specs 2019-05-28 17:04:06 +01:00
luisramos0
d2f62f86a9 Run transpec in a few spec/features/admin specs 2019-05-28 16:59:51 +01:00
luisramos0
80537e7e01 Run transpec in spec/features/admin/image_settings_spec.rb 2019-05-28 16:57:11 +01:00
luisramos0
7f43a66fb3 Run transpec in spec/features/admin/adjustments_spec 2019-05-28 16:57:11 +01:00
luisramos0
86b0d71c7e Result of rubocop auto-correct and rebuilding rubocop_manual_todo 2019-05-28 12:57:29 +01:00
Luis Ramos
6658f85f59 Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation 
3292 link popup text translation
 2019-05-07 21:11:31 +01:00
stveep
a959702905 Add display_name and display_as to admin edit variant page 2019-05-04 17:20:12 +01:00
jazzdragon
b42426a3b8 Add test for existing input alert text 2019-04-27 18:52:23 -07:00
Luis Ramos
29000ebe0d Merge pull request #3651 from luisramos0/2-0-enterprise-fee-report 
[Spree Upgrade] Fix Enterprise fee report specs
 2019-04-16 12:36:53 +01:00
luisramos0
5791eba9bd Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed 2019-04-10 22:16:09 +01:00
Luis Ramos
4bf9320be8 Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees 
Close adjustments so that updates are effective
 2019-04-10 21:58:22 +01:00
Luis Ramos
97c920f1b0 Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments 
3477 Render only eligible adjustments on the order page
 2019-04-10 21:44:16 +01:00
luisramos0
e4c54a4954 Add order distributor to shipping method in reports_spec 2019-04-09 23:26:14 +01:00
Maikel Linke
84501b9e41 Move feature spec to controller spec 
It reduces the runtime (3s instead of 10s).
 2019-04-04 17:01:44 +11:00
Maikel Linke
7b116c0982 Remove unnecessary condition from spec 2019-04-04 16:51:18 +11:00
Maikel Linke
72458da465 Comply to code convention using I18n.t in specs 2019-04-04 16:26:52 +11:00
luisramos0
40124b7421 Improve downloads_helper clear_downloads method 2019-04-02 11:39:52 +01:00
luisramos0
e10264af86 Remove xfeature from enterprise fees summmary report spec 2019-04-02 11:39:52 +01:00
luisramos0
c36f7e003b Adapt assertions to new csv file download logic 2019-04-02 11:39:52 +01:00
luisramos0
4f803eba7e Add around blocks to clear downloads directory before and after every test 2019-04-02 11:39:52 +01:00
luisramos0
c291601d9f Fix rubocop warnings in enterprise_fee_summary report spec 2019-04-02 11:39:52 +01:00
Maikel Linke
500cf925ad Fix HTML validity and element finding in spec 
The fixed partial was used twice on the same page. So the used element
id appeared twice on the page which is invalid HTML. It also confused
the spec.

Now we look at the actually displayed text to select the correct
element.
 2019-04-02 16:50:44 +11:00
luisramos0
1fc4b7fd2a Add manual shipping adjustment 
For some reason this adjustment is not being added to order through the callbacks as it was before. See PR #3371
 2019-03-29 22:16:39 +00:00
luisramos0
d713c755e6 Uncomment report specs so we can make them work in v2 2019-03-29 22:16:38 +00:00
Maikel Linke
5760aed6a6 Render only eligible adjustments on the order page 
https://github.com/openfoodfoundation/openfoodnetwork/issues/3477

The admin orders edit form was displaying adjustments even if they were
"not eligible". For example, an additional fee with amount `0` is not
eligible. They were already hidden in the adjustments view and we are
hiding them in reports.
 2019-03-29 18:41:38 +11:00