Commit graph

24 commits

Author SHA1 Message Date
wvengen
6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +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
25854f2de7 do not store GroupOrderArticles with zero quantity and tolerance 2014-05-13 17:01:26 +02: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
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
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
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
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
50f5064d8e fix product distribution integration test 2013-07-25 13:08:38 +02:00
wvengen
e9ed6f8c0f Revert "try to fix integration spec on travis"
This reverts commit 06d39f52ca.
2013-07-25 01:25:08 +02:00
wvengen
06d39f52ca try to fix integration spec on travis 2013-07-25 00:35:42 +02:00
wvengen
a6114f137b add order integration spec 2013-07-24 21:25:57 +02:00
wvengen
62682b7e64 make integration test work 2013-07-24 12:37:20 +02:00
wvengen
8af04e0112 add product distribution integration test 2013-07-24 04:04:59 +02:00
wvengen
a858ceedea more flexible login in spec helper 2013-07-24 01:11:36 +02:00
wvengen
d58ce31b7f add first integration test 2013-07-24 01:05:01 +02:00