raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 16 Branches 454 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
1c61539119 Merge pull request #2585 from greysteil/bump-ams 
Bump active_model_serializer to 0.8.4, and pin it
 2018-08-30 10:00:22 +10:00
Maikel
fac29ebb96 Merge pull request #2595 from openfoodfoundation/dependabot/bundler/immigrant-0.3.6 
Bump immigrant from 0.1.6 to 0.3.6
 2018-08-30 09:56:37 +10:00
luisramos0
efcf680094 Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment 
Fixed 5 out of 7 tests in orders_and_fulfillments_report_spec by providing target_shipment in test line_items
Fixed 12 out of 44 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.” “The remaining 32 failing tests are now failing with the very common: undefined method on_hand= on Spree::Variant
Improved 1 test in reports_spec.rb by providing target_shipment in test line_items. Test now fails with undefined method Spree::Order.shipping_method
Fixed 9 tests in orders_controller_spec by providing target_shipment in test line_items
Fixed 4 tests in packing_report_spec.rb by providing target_shipment in test line_items. Failing tests are now failing with undefined product.on_hand? method
Fixed 8 tests in line_items_controller_spec by providing target_shipment in test line_items
Fixed 1 test in update_billable_periods_spec by providing target_shipment in test line_items
Fixed 4 tests in bulk_coop_report_spec by providing target_shipment in test line_items. The 2 failing tests are now failing with undefined product.on_hand? method
Improved 1 test in line_items_controller_spec by providing target_shipment in test line_items. Test is still failing with an unexpected method call
Fixed 1 test in order_and_distributor_report_spec by providing target_shipment in test line_items
 2018-08-30 00:33:15 +01:00
luisramos0
02b968b312 Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view 2018-08-30 00:27:35 +01:00
luisramos0
53e7fcb019 Imcreased cookies banner font size for med/large screens to improve readability 2018-08-30 00:21:00 +01:00
luisramos0
8dc10ffc6e Added new test to cookies spec to cover bug on cookies banner and fixed it. See issue #2599. 
Also, improved readability on cookies spec with some extracted methods.
 2018-08-28 23:48:22 +01:00
dependabot[bot]
3d8c4c69a7 Bump poltergeist from 1.16.0 to 1.18.1 
Bumps [poltergeist](https://github.com/teampoltergeist/poltergeist) from 1.16.0 to 1.18.1.
- [Release notes](https://github.com/teampoltergeist/poltergeist/releases)
- [Changelog](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md)
- [Commits](https://github.com/teampoltergeist/poltergeist/compare/v1.16.0...v1.18.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-28 19:15:06 +00:00
Matt-Yorkley
8de0355dc7 Add spec for multiple stages during import 2018-08-28 14:05:57 +01:00
Matt-Yorkley
f905284f7a Add spec for edge case 2018-08-28 12:45:04 +01:00
Maikel
189bd0911b Merge pull request #2574 from luisramos0/bulk_line_items_controller_spec_fix 
Spree2 - Bulk line items controller spec fix
 2018-08-28 16:47:04 +10:00
Maikel
79f50e0b7b Merge pull request #2353 from luisramos0/customers_admin_country_state 
fixed UX problem in the state selector in customers admin
 2018-08-28 16:46:00 +10:00
Maikel
b4bea59bb0 Merge pull request #2567 from greysteil/better-feater-matchers 
Switch feature matcher style from `to_not have` to `to have_no`
 2018-08-28 16:44:57 +10:00
Matt-Yorkley
6b9b8d8b73 Match multiple product names 2018-08-28 03:26:17 +01:00
Grey Baker
562a7936d9 Bump active_model_serializer to 0.8.4 2018-08-28 01:00:06 +01:00
Maikel
c39ac26f57 Merge pull request #2580 from openfoodfoundation/dependabot/bundler/stripe-3.3.2 
Bump stripe from 3.3.1 to 3.3.2
 2018-08-28 09:42:38 +10:00
Matt-Yorkley
8c2a49a57c Update PI model spec 2018-08-27 23:08:19 +01:00
Matt-Yorkley
1df1ddcf66 Add spec for saving product and variant simultaneously 2018-08-27 23:06:54 +01:00
luisramos0
082f9e404b Fixed test on order_cycle_spec by replacing eq with match_array 2018-08-27 21:04:18 +01:00
luisramos0
b5038fa5dc Changed calls to MailMethod in specs to calls to Spree::Config[:mails_from] 2018-08-27 21:02:54 +01:00
dependabot[bot]
61097c3bf9 Bump immigrant from 0.1.6 to 0.3.6 
Bumps [immigrant](https://github.com/jenseng/immigrant) from 0.1.6 to 0.3.6.
- [Release notes](https://github.com/jenseng/immigrant/releases)
- [Changelog](https://github.com/jenseng/immigrant/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenseng/immigrant/compare/v0.1.6...v0.3.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-27 19:18:13 +00:00
dependabot[bot]
67802cd4ee Bump compass-rails from 2.0.4 to 3.1.0 
Bumps [compass-rails](https://github.com/Compass/compass-rails) from 2.0.4 to 3.1.0.
- [Release notes](https://github.com/Compass/compass-rails/releases)
- [Changelog](https://github.com/Compass/compass-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Compass/compass-rails/compare/2.0.4...3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-27 19:17:55 +00:00
Maikel Linke
58cbe492d4 Remove gem rack-livereload 
I don't think that anybody is using it. I asked on Slack and people
didn't know what it was. I kept guard-livereload which is probably
offering the same, maybe even better.
 2018-08-27 16:34:50 +10:00
Maikel
44faa116db Merge pull request #2583 from mkllnk/seed-mail-connection-type 
Configure mail TLS or SSL connection when seeding
 2018-08-27 09:52:56 +10:00
Kristina Lim
28792fc895 Add tests for adding/updating enterprise images 2018-08-26 03:58:19 +08:00
luisramos0
0de691b821 Delete outdated base_mailer_decorator.from_address (it used old MailMethod). This way we rely on the correct spree base_mailer.from_address (that gets it from Spree::Config 2018-08-25 13:47:05 +01:00
luisramos0
27f5e6db8a Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: 32d2adc8a2 (diff-aa82d768109073ea8ad7858146630be4R9). Spree change introduced here: 8d90ae15f8 (diff-1e2ba31309f1f1abd2a4b626036d316fR94) 2018-08-25 12:50:36 +01:00
Maikel
8eee8f96ed Merge pull request #2557 from Matt-Yorkley/pi/class_descriptions 
Class descriptions for Product Import
 2018-08-24 18:14:12 +10:00
Matt-Yorkley
717f626dfe Refactor enterprise validation 2018-08-24 15:51:37 +10:00
Matt-Yorkley
2b057a26d5 Add primary_producer to index to reduce queries 2018-08-24 15:51:37 +10:00
Matt-Yorkley
666fbf53bf Validate enterprise.is_primary_producer? 2018-08-24 15:51:37 +10:00
Maikel
616b42a14d Merge pull request #2555 from luisramos0/cookie_http_only 
Added httponly to cookieConsent cookie, this makes this cookie secure…
 2018-08-24 15:50:13 +10:00
Maikel
a37931afda Merge pull request #2542 from luisramos0/add_to_cart 
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
 2018-08-24 14:43:33 +10:00
Maikel
bf55190136 Merge pull request #2546 from Matt-Yorkley/pi/sku_validation 
Remove empty SKU values if empty
 2018-08-24 14:32:00 +10:00
Maikel Linke
b158c92998 Configure mail TLS or SSL connection when seeding 
This allows to seed the secure connection type of the default mail
method.
 2018-08-24 14:03:21 +10:00
Maikel
871e423e12 Merge pull request #2548 from kristinalim/feature-bulk_update_of_order_cycle_name 
Make OC name editable from the OC index
 2018-08-24 11:38:31 +10:00
Maikel
c4c4547338 Merge pull request #2572 from greysteil/bump-webmock 
Bump webmock
 2018-08-24 08:49:11 +10:00
dependabot[bot]
358bb3030a Bump stripe from 3.3.1 to 3.3.2 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-23 19:16:15 +00:00
dependabot[bot]
2e4a8d6318 Bump angular-rails-templates from 0.2.0 to 0.3.0 
Bumps [angular-rails-templates](https://github.com/pitr/angular-rails-templates) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/pitr/angular-rails-templates/releases)
- [Changelog](https://github.com/pitr/angular-rails-templates/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pitr/angular-rails-templates/compare/v0.2.0...v0.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-23 19:15:48 +00:00
luisramos0
910297572e Removed unnecessary currency from CartService constructor, using order.currency instead 2018-08-23 12:40:18 +01:00
luisramos0
ec069b1e3e Converted specs to latest rspec syntax 2018-08-23 12:39:58 +01:00
luisramos0
c7b202f932 Fixed CodeClimate warnings on services/cart_services.rb 2018-08-23 12:39:58 +01:00
luisramos0
05bfc098ff /controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator. 2018-08-23 12:39:55 +01:00
luisramos0
6caa361354 Moved Spree::OrderController.populate to new CartController. 
This was done to make order populate independent of Spree::OrdersController
 2018-08-23 12:37:52 +01:00
Maikel
0312bf93dd Merge pull request #2556 from luisramos0/cookies_failing_tests 
Make cookies tests more stable
 2018-08-23 13:29:02 +10:00
Maikel Linke
00b8b0a36c Sleep to avoid race conditions in cookie spec 
We tried a lot to avoid these sleep commands, but nothing worked. So
it's better to have reliable specs than fast specs.
 2018-08-23 13:13:05 +10:00
Maikel
0c35d1bade Merge pull request #2570 from openfoodfoundation/dependabot/bundler/atomic-1.1.101 
Bump atomic from 1.1.99 to 1.1.101
 2018-08-23 11:05:46 +10:00
Maikel
5dd0aed1c0 Merge pull request #2569 from openfoodfoundation/dependabot/bundler/rack-livereload-0.3.17 
Bump rack-livereload from 0.3.16 to 0.3.17
 2018-08-23 10:56:00 +10:00
Maikel
bc192dabbc Merge pull request #2564 from openfoodfoundation/dependabot/bundler/fuubar-2.3.2 
Bump fuubar from 2.2.0 to 2.3.2
 2018-08-23 10:10:07 +10:00
Maikel
7d40e960f4 Merge pull request #2563 from openfoodfoundation/transifex 
Transifex
 2018-08-23 10:06:16 +10:00
Maikel
92e9392bc5 Merge pull request #2561 from mkllnk/2233-enable-embedded-shopping-spec 
Enable embedded shopping spec
 2018-08-23 09:23:12 +10:00