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 |
|
wvengen
|
e9ed6f8c0f
|
Revert "try to fix integration spec on travis"
This reverts commit 06d39f52ca.
|
2013-07-25 01:25:08 +02:00 |
|
wvengen
|
c753ae0471
|
comment tests that are unclear how they should behave
|
2013-07-25 01:07:41 +02:00 |
|
wvengen
|
9a12ea9efc
|
fix uniquess spec problems
|
2013-07-25 00:52:41 +02:00 |
|
wvengen
|
06d39f52ca
|
try to fix integration spec on travis
|
2013-07-25 00:35:42 +02:00 |
|
wvengen
|
1e986e704a
|
remove spec test that is broken and not really useful
|
2013-07-25 00:07:39 +02:00 |
|
wvengen
|
ebf71ad494
|
fix price history spec
|
2013-07-25 00:01:58 +02:00 |
|
wvengen
|
d602b7cd0d
|
use expect instead of should in specs
|
2013-07-24 22:48:48 +02:00 |
|
wvengen
|
0be3955cd7
|
Revert "cleaner way to set foodcoop scope"
This reverts commit 23a08b2ac8.
Conflicts:
spec/spec_helper.rb
|
2013-07-24 22:06:53 +02:00 |
|
wvengen
|
a6114f137b
|
add order integration spec
|
2013-07-24 21:25:57 +02:00 |
|
wvengen
|
23a08b2ac8
|
cleaner way to set foodcoop scope
|
2013-07-24 20:44:07 +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
|
0d33922ed9
|
make integration spec work with javascript driver too
|
2013-07-24 02:58:53 +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 |
|
wvengen
|
427a023135
|
add group_order_article spec
|
2013-07-15 21:01:46 +02:00 |
|
wvengen
|
679fc673c7
|
add group_order spec
|
2013-07-15 18:45:02 +02:00 |
|
wvengen
|
3a7d650ed8
|
fix tests
|
2013-07-15 17:57:20 +02:00 |
|
wvengen
|
cc6a188f4e
|
fix small test bug
|
2013-07-15 00:22:20 +02:00 |
|
wvengen
|
acd18721aa
|
expand rspec tests
|
2013-07-15 00:17:07 +02:00 |
|