15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maikel Linke	f4d5727fb4	Associate customers with their user records ... When we introduced the Customer model, we didn't associate any existing customers with users that have the same email address. Later we decided to create that association when users sign up. But we didn't update all the existing customers. We do that now for data consistency and to solve several bugs.	2018-11-23 15:38:35 +11:00
luisramos0	d28f47046a	Fix product model spec by removing unnecessary on_hand setter and adding required fields for a new product	2018-11-22 20:38:58 +00:00
luisramos0	134b73d730	Improve VariantStock code by extracting stockitems.first to a separate method	2018-11-22 20:38:46 +00:00
Luis Ramos	0052d571b9	Merge pull request #3100 from HugsDaniel/2999-checkout-feature-specs ... [Spree Upgrade] Fix checkout feature specs	2018-11-22 16:49:41 +00:00
Hugo Daniel	d7a148bb75	Fix checkout feature specs	2018-11-22 17:01:39 +01:00
Luis Ramos	d060d31051	Merge pull request #3117 from HugsDaniel/3034-api-products-controller-spec ... Use :user factory instead of build_stubbed to create the current_api_…	2018-11-22 14:10:05 +00:00
Hugo Daniel	a08ddd8171	Use :user factory instead of build_stubbed to create the current_api_user	2018-11-22 14:29:37 +01:00
Pau Pérez Fabregat	064ec7d270	Merge pull request #3108 from luisramos0/2-0-new-order ... [Spree Upgrade] Add missing translation to admin new order creation page	2018-11-22 10:39:06 +01:00
Maikel Linke	95dbfae757	Use expect syntax	2018-11-22 15:42:56 +11:00
Maikel	be7fea9d14	Merge pull request #3003 from kevinchristianson/getting-started-edits ... Getting Started edits	2018-11-22 12:51:16 +11:00
haseleyi	07e246db39	Remove outdated time zone precaution from Getting Started wiki	2018-11-21 15:56:14 -08:00
haseleyi	364a00074b	Remove Resources header	2018-11-21 15:56:14 -08:00
Kevin Christianson	7dce6e1180	Remove weird red "for" text in Troubleshooting	2018-11-21 15:56:14 -08:00
Kevin Christianson	1216567be9	Add Troubleshooting section with an alternative database setup	2018-11-21 15:56:13 -08:00
Samuel Nozaki	a7032a8822	Clarify that the time zone should be Melbourne	2018-11-21 15:56:13 -08:00
nozakis	6a73ee86f8	Clarify GETTING_STARTED.md in regards to rspec test failures and time zones	2018-11-21 15:56:13 -08:00
haseleyi	d4b49a662f	Add translation for 'Back to Payments List' button in new payment form	2018-11-21 15:33:45 -08:00
luisramos0	2abf4e39cb	Add missing translation to admin new order creation page	2018-11-21 23:22:43 +00:00
Luis Ramos	391deb94b0	Merge pull request #3102 from luisramos0/2-0-fix-admin-adjusts-spec ... [Spree Upgrade] Fix spec/features/admin/adjustments_spec	2018-11-21 22:27:28 +00:00
Matt-Yorkley	b3a9b502fa	Add missing translation key	2018-11-21 19:16:08 +00:00
Matt-Yorkley	a5407d780c	Include unexpected validation errors	2018-11-21 19:16:07 +00:00
Pau Pérez Fabregat	ac9cfaa8c3	Merge pull request #3093 from mllocs/fix/factories-ignore-warning ... Fixed Factory warning while running tests	2018-11-21 14:44:03 +01:00
Pau Pérez Fabregat	6a1776b84a	Merge pull request #3053 from HugsDaniel/3050-products-new-views ... [Defacepocalypse] Import products#new view into our codebase and apply overrides	2018-11-21 14:43:22 +01:00
luisramos0	24a7494103	Fix admin/adjustments spec by renaming test adjustment from Shipping to Extra Adjustment. ... This was causing an error because the order factory now includes a Shipping adjustment	2018-11-21 13:41:16 +00:00
luisramos0	783e0eed3c	In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml	2018-11-21 11:46:14 +00:00
luisramos0	0189cefd1c	Update all locales with the latest Transifex translations	2018-11-20 22:40:11 +00:00
Maxim Colls	f179bf8c49	Fixed Factory warning while running tests	2018-11-20 18:27:43 +00:00
Pau Pérez Fabregat	398092fa50	Merge pull request #3065 from openfoodfoundation/dependabot/bundler/turbo-sprockets-rails3-0.3.14 ... Bump turbo-sprockets-rails3 from 0.3.6 to 0.3.14	2018-11-20 12:13:23 +01:00
Pau Pérez Fabregat	4c6dec6203	Merge pull request #3082 from coopdevs/remove-travis-leftovers ... Remove all database.travis.yml	2018-11-20 09:35:12 +01:00
Maikel	733a018f37	Merge pull request #3081 from luisramos0/2-0-enterprise-groups ... [Spree Upgrade] Fix features/admin/enterprise_groups_spec by replacing select2_search with select2_select	2018-11-20 16:41:05 +11:00
Maikel	b05bfc5cc7	Merge pull request #3075 from luisramos0/2-0-setting-transl ... [Spree Upgrade] Fix translation issue in settings spec	2018-11-20 16:39:54 +11:00
Maikel	5e82d38bec	Merge pull request #3071 from luisramos0/2-0-xdescribe-proxy-order ... [Spree Upgrade] Move ProxyOrder controller to xdescribe	2018-11-20 16:38:42 +11:00
Maikel	6835d24fbf	Merge pull request #3004 from luisramos0/2-0-mail-method-fix ... [Spree Upgrade] Fix line Item specs with problems related to VariantStock.on_hand=	2018-11-20 16:37:19 +11:00
Luis Ramos	a7bd793ad2	Merge pull request #3074 from luisramos0/2-0-acct-transl ... [Spree Upgrade] Fix missing translation in User transaction history	2018-11-20 00:43:24 +00:00
Luis Ramos	e297b19a91	Merge pull request #3069 from luisramos0/2-0-check-missing-translation ... [Spree Upgrade] Add missing translation in the checkout confirmation page	2018-11-20 00:39:05 +00:00
Luis Ramos	d984d76e6b	Merge pull request #3070 from luisramos0/2-0-order-spec-restart ... [Spree Upgrade] Fix order spec restart checkout test and orders controller enterprise with fees test	2018-11-20 00:38:11 +00:00
Pau Perez	9301c5e1d5	Remove all database.travis.yml ... We no longer use this file since we started with Semaphore CI.	2018-11-19 17:16:04 +01:00
luisramos0	5f48f2b8a1	Fix enterprise groups spec by replacing select2_search with select2_select for country and state in enterprise group address	2018-11-19 12:44:25 +00:00
Pau Pérez Fabregat	27267926dc	Merge pull request #3079 from luisramos0/2-0-order-feature-spec ... [Spree Upgrade] Fix 3 tests in shopping/orders_spec	2018-11-19 12:51:07 +01:00
luisramos0	bf32a21155	Allow adapted on_hand attr to be mass assigned in VariantStock. ... Without specifying it in `attr_accessible`, `#assign_attributes` won't work. See details in https://apidock.com/rails/v3.2.13/ActiveRecord/Persistence/update_attributes and https://apidock.com/rails/ActiveRecord/Base/assign_attributes.	2018-11-19 10:05:17 +00:00
Maikel	90e8813ff6	Merge pull request #3054 from coopdevs/fix/incorrect-order-dates ... Fix/incorrect order dates	2018-11-19 09:17:11 +11:00
luisramos0	9deb249dec	Fix order by changing expected results: order is paid. ... These tests use order factory order_with_credit_payment with ‘amount: order.total + 10000’ and since spree 2 when order payment state is credit_owned (customer has credit after the order), the order is considered paid 71c6c4f297	2018-11-18 20:58:55 +00:00
luisramos0	a20aba26cd	Fix order feature spec by adapting to new spree 2 order factory with 5 line_items by default. Removed currency sign to avoid having problems with it, it's not really part of the spec objective	2018-11-18 16:51:43 +00:00
luisramos0	d29778e2d1	Fix translation issue in spec by refering the correct translation namespace: spree	2018-11-18 16:36:03 +00:00
luisramos0	d282823d3a	Fix missing translation in user transaction history	2018-11-18 16:15:35 +00:00
Maxim Colls	884d4d0122	Fixed specs	2018-11-17 19:46:09 +01:00
Maxim Colls	3301b5850a	Improved UX in the accordion steps in the checkout page	2018-11-17 18:48:10 +01:00
luisramos0	d1071acfdb	Move ProxyOrder controller to xdescribe. It's part of non-core feature subscriptions and will be left for spree upgrade phase 2	2018-11-17 12:23:52 +00:00
luisramos0	b40c0e5b80	Fix order controller spec with enterprise fees by adapting to new order factory with 5 line items by default	2018-11-17 12:11:23 +00:00
luisramos0	ee8d77bc09	Fix order spec restart checkout test by adding a required line_item to the order being tested	2018-11-17 11:57:16 +00:00