Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1612 commits 22 branches 1 tag 31 MiB
Commit graph

72 commits

Author SHA1 Message Date
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
a594dffed2 disable config validation (closes foodcoops#313) 2014-09-30 15:09:47 +02:00
Benjamin Meichsner
d2a218c9fa Fixed rspec deprecation warning concerning spec type. 2014-09-21 12:28:00 +02:00
wvengen
8b83787252 simplify config loading 2014-09-11 16:40:21 +02:00
wvengen
1c878c3c13 fix config issue with nested hash 2014-09-02 16:19:08 +02:00
wvengen
10a193add3 make nested properties work better 2014-09-02 15:02:26 +02:00
wvengen
f09ef892dc add foodsoft_config protection whitelisting 2014-09-02 15:02:25 +02:00
wvengen
6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen
647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen
d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen
63d52db91b more sensible mailer option defaults 
Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
 2014-09-02 12:35:57 +02:00
wvengen
72709be60a try workaround for failing test 
(closes foodcoops#303)
 2014-08-25 18:29:59 +02:00
wvengen
21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen
6d98be6d22 reload app config before each test 
(complements 21bef8e304d05025b72b39e790abc7e8a4f4f5e1)
 2014-05-13 17:01:26 +02:00
wvengen
ed439d0b08 use minimal app_config for tests 2014-05-13 17:01:26 +02:00
wvengen
25854f2de7 do not store GroupOrderArticles with zero quantity and tolerance 2014-05-13 17:01:26 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen
f8fca4d630 fix order article add + test 2014-02-24 11:37:06 +01:00
wvengen
60826ceedc allow to edit GroupOrderArticle result from orders screen 
Conflicts:
	app/assets/javascripts/application.js
 2014-02-10 16:03:08 +01:00
wvengen
e88810e4a7 fix "Mysql2::Error: This connection is in use by" in spec for Rails 4 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-10 15:58:52 +01:00
wvengen
49e563af89 allow non-shared articles to be part of a shared supplier using a blank order number 2014-01-24 22:10:00 +01:00
wvengen
b30b424540 Merge branch 'master' into feature-receive 
Conflicts:
	app/helpers/finance/order_articles_helper.rb
 2014-01-09 18:42:29 +01:00
wvengen
8f14ab31f3 cleanup and expand receive integration test 2014-01-08 13:07:11 +01:00
wvengen
d01d1bc496 add integration tests for receive 2014-01-08 11:52:45 +01:00
Manuel Wiedenmann
0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
wvengen
2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen
147365cba1 update coverage and use coveralls.io 2013-12-16 23:11:39 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen
66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen
4219eff0ab fix rspec warning 2013-11-13 23:22:26 +01:00
wvengen
ac6b00d4f5 add unit tests for shared database synchronisation 2013-11-13 23:09:17 +01:00
wvengen
e883f4cfa7 fix last commit for non-js tests 2013-10-30 01:28:59 +01:00
wvengen
042fbdc3a3 maximise window before running tests 2013-10-30 01:03:51 +01:00
wvengen
c37ed74942 Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/foodcoop/users/_users.html.haml
 2013-10-29 19:15:52 +01:00
wvengen
bfcf35cd34 fix i18n spec after changes 2013-10-17 17:10:33 +02:00
wvengen
9ac9d1ea50 add spec for foodcoops/foodsoft#179 2013-10-02 16:32:01 +02:00
wvengen
a77c3b59b1 allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
wvengen
6b0146eb95 add spec for article#in_open_order 2013-09-18 22:46:57 +02:00
Benjamin Meichsner
857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion 
Keep member order on orderarticle deletion
 2013-09-18 08:32:33 -07:00
Manuel Wiedenmann
f462e70e49 uses FactoryGirl helpers 2013-09-18 12:44:41 +02:00
wvengen
f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen
1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02:00
wvengen
37e5b0c25c add balancing integration spec 2013-07-26 18:34:03 +02:00
wvengen
eac8260b38 add i18n tests 2013-07-25 14:46:25 +02:00
wvengen
ca50006235 add coverage report, set COVERAGE=1 in env when running specs 2013-07-25 14:00:08 +02:00
wvengen
0f01b87e3b do not exceed 99 articles when ordering in specs 2013-07-25 13:21:24 +02:00
wvengen
50f5064d8e fix product distribution integration test 2013-07-25 13:08:38 +02:00
wvengen
7dafcf714a spec move functionality into factory 2013-07-25 11:16:39 +02:00
wvengen
b302cbde4f make sure price spec works when price is zero 2013-07-25 09:42:29 +02:00