Paul J Stevens
9710d3b479
post-merge cleanups
2018-05-26 11:45:28 +02:00
Paul J Stevens
5536adc3ec
Merge branch 'develop' into feature/djangoconf-sprint
2018-05-26 10:48:33 +02:00
Paul J Stevens
5b8d578493
only test for wagtail2 and django2 on python3
2018-05-26 09:54:56 +02:00
Paul J Stevens
bdba6b65cf
use new wagtail_factories package
2018-03-22 14:41:54 +01:00
Paul J Stevens
cbcd80d248
update tox.ini
2018-03-17 11:56:14 +01:00
Paul J Stevens
9b1c5a6ab6
fixes test runs
...
added dependency link to Makefile until Michael releases new
wagtail-factories
2018-03-17 11:37:11 +01:00
Paul J Stevens
62d258fd9e
fixes wagtail2 compatibility
...
return QuerySets instead of lists
2018-03-17 11:26:56 +01:00
blurrah
32e73329c3
Revert wagtail-factories setting
2018-03-16 11:51:25 +01:00
blurrah
fde53ea0ef
Fix all tests for django and wagtail 2
2018-03-16 11:45:07 +01:00
blurrah
22a7367211
Update module paths for tests
2018-03-16 11:16:47 +01:00
Jasper Berghoef
0d89d47735
Prevent webpack copy error from img dir
2018-03-16 11:14:19 +01:00
Jasper Berghoef
92189a3be8
Fix dashboard edit links
2018-03-16 11:14:19 +01:00
Paul J Stevens
6c9d8b2730
remove typo
2018-03-16 11:14:19 +01:00
Paul J Stevens
e141e5396e
make Makefile more portable
2018-03-16 11:14:19 +01:00
Jasper Berghoef
c0e2b969e8
Set site ID in sandbox settings
2018-03-16 11:14:19 +01:00
Jasper Berghoef
7b5e3d4c9d
Fix exampledata
2018-03-16 11:14:19 +01:00
Jasper Berghoef
6b7a1ed591
Updated requirements and module paths
2018-03-16 11:14:19 +01:00
Mike Dingjan
9b25cd2a94
Add missing dependency `pytest-pythonpath`
2018-03-16 11:10:45 +01:00
Kaitlyn Crawford
3a86c189dc
Merge tag '0.11.3' into develop
...
Bugfix: Handle errors when testing an invalid visit count rule
2018-03-09 20:35:33 +02:00
Kaitlyn Crawford
82c26f9772
Merge branch 'release/0.11.3'
2018-03-09 20:35:20 +02:00
Kaitlyn Crawford
03eb812e45
Version 0.11.3
2018-03-09 20:35:08 +02:00
Kaitlyn
e3522d0acb
Merge pull request #26 from praekeltfoundation/feature/catch-exceptions-when-visit-count-rule-is-blank
...
Handle exceptions for empty VisitCountRule
2018-03-09 20:32:05 +02:00
Kaitlyn Crawford
7f5e958ee3
Catch the exception if the visit count rule doesn't have a page
2018-03-09 19:20:30 +02:00
Kaitlyn Crawford
241bfb5240
Merge tag '0.11.2' into develop
...
Bugfix: Stop populating static segments when the count is reached
2018-03-08 14:00:58 +02:00
Kaitlyn Crawford
d5df6e0e58
Merge branch 'release/0.11.2'
2018-03-08 14:00:38 +02:00
Kaitlyn Crawford
865efd0792
Version 0.11.2
2018-03-08 13:59:23 +02:00
Kaitlyn
454c936e0f
Merge pull request #25 from praekeltfoundation/feature/fix-static-segment-population
...
Fix off-by-one error in static segment population
2018-03-08 13:24:48 +02:00
Kaitlyn Crawford
74d3123084
Ensure static segments don't have one extra user
2018-03-08 13:14:29 +02:00
Kaitlyn Crawford
9bfd816430
Merge tag '0.11.1' into develop
...
Populate entirely static segments from registered Users not active Sessions
2018-03-01 16:26:46 +02:00
Kaitlyn Crawford
02e06bd9f3
Merge branch 'release/0.11.1'
2018-03-01 16:26:35 +02:00
Kaitlyn Crawford
c7ad3251cf
Version 0.11.1
2018-03-01 16:26:20 +02:00
Kaitlyn
cb8b7da496
Merge pull request #23 from praekeltfoundation/feature/populate-static-segments-from-db-at-creation
...
Populate static segments from database
2018-03-01 16:23:10 +02:00
Kaitlyn Crawford
0efd3ae937
Update tests for new static segment population
2018-02-26 14:34:02 +02:00
Kaitlyn Crawford
d335e4fd7b
Populate static segments even if the count is 0
2018-02-26 14:31:56 +02:00
Kaitlyn Crawford
db2f82967e
Only loop through users once when saving static segments
...
When saving a new static segment we count the matching users and
populate the segment from the database. Each of these requires us
to loop through all of the users, so it's better to do them at the
same time.
2018-02-25 15:43:12 +02:00
Kaitlyn Crawford
37243365a7
Merge branch 'develop' into feature/populate-static-segments-from-db-at-creation
2018-02-25 15:08:36 +02:00
Kaitlyn Crawford
43a2b590b4
Merge tag '0.11.0' into develop
...
Bug Fix: Query rule should not be static
Enable retrieval of user data for static rules through csv download
2018-02-23 17:02:53 +02:00
Kaitlyn Crawford
cc1dd337bb
Merge branch 'release/0.11.0'
2018-02-23 17:02:34 +02:00
Kaitlyn Crawford
a677846ff7
Bump version to 0.11.0
2018-02-23 17:02:17 +02:00
Kaitlyn
7d7861b862
Merge pull request #22 from praekeltfoundation/feature/SAS-72-download-cvs-of-user-data
...
Download CSV of users in a segment
2018-02-23 16:50:52 +02:00
Kaitlyn Crawford
8e854d0abe
Merge branch 'develop' into feature/SAS-72-download-cvs-of-user-data
2018-02-23 14:05:31 +02:00
Kaitlyn
0051061d96
Merge pull request #21 from praekeltfoundation/feature/SAS-72-get-user-info-for-visit-count-rule
...
Get user info from visit count rule
2018-02-23 14:02:15 +02:00
Kaitlyn Crawford
f898dfe017
Actually add tests for segment users view
2018-02-22 16:12:24 +02:00
Kaitlyn Crawford
8ced5bd81c
Fix flake8
2018-02-22 15:15:01 +02:00
Kaitlyn Crawford
9a86b0c8cc
Add tests for segment users view
2018-02-22 15:14:34 +02:00
Kaitlyn Crawford
9408f90789
Use mock for testing matching user count
...
The fake class was causing other tests to fail because it inherits from AbstractBaseRule but isn't in the database.
I removed it and replaced it with mocked calls
2018-02-22 14:23:14 +02:00
Kaitlyn Crawford
ba6056e3f8
Link to download CSV of users in segment
2018-02-22 14:21:43 +02:00
Kaitlyn Crawford
fdc0a7f2e1
Get user info for Visit count rule
2018-02-21 19:08:29 +02:00
Kaitlyn Crawford
12b0cd9231
Make visit count session retrieval seperate method
2018-02-21 19:07:35 +02:00
Kaitlyn Crawford
330557be8d
Make VisitCountRule.test_user actually test with only a user
2018-02-21 18:48:44 +02:00
