Commit graph

719 commits

Author SHA1 Message Date
Nicolas Lœuillet
900c844861
Exploded WallabagRestController into many controllers
Fix #2503
2016-10-28 14:46:30 +02:00
Nicolas Lœuillet
f24ea59ea4
Fixed migration and added tests 2016-10-28 10:55:39 +02:00
Jeremy Benoist
64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist
9313ea9d44 Merge pull request #2401 from wallabag/reset-account
Reset account
2016-10-24 11:57:51 +02:00
Jeremy Benoist
206bade58a
Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Jeremy Benoist
aa4741091f
Add test on /api/annotations
Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other
2016-10-22 12:09:20 +02:00
Nicolas Lœuillet
e5edb6e127
PHP CS 2016-10-22 09:06:07 +02:00
Thomas Citharel
0c271b9eb0
fix cs and phpdoc 2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes
Some fixes
2016-10-21 15:15:41 +02:00
Jeremy Benoist
f6798f69c3
This test doesn’t require an internet connection 2016-10-20 23:26:16 +02:00
Jeremy Benoist
9095497191
Fix test 2016-10-20 23:03:37 +02:00
Jeremy Benoist
2297d60f10
If reload content failed, don’t update it
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
2016-10-20 22:49:46 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub
API: ability to export entry in all available format (epub, pdf, etc...)
2016-10-12 14:06:33 +02:00
Jeremy Benoist
e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Jeremy Benoist
a0a4ce3135
Lock deps for FOSUser
We’ll wait until the final release will be out and other related project will be update to support it.
Meanwhile we can safely lock to a previous version.
2016-10-11 18:59:08 +02:00
Jeremy Benoist
e40bed3607
Avoid error when Redis isn't here in tests 2016-10-10 16:34:57 +02:00
Jeremy Benoist
876d77a67d
Better display and description
Confirmation message isn’t required since it is written in the delete description
2016-10-08 20:25:42 +02:00
Jeremy Benoist
c3396c65ef
Fix some tests 2016-10-08 14:07:13 +02:00
Nicolas Lœuillet
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion
Changed relation between API client and refresh token
2016-10-08 13:31:54 +02:00
Nicolas Lœuillet
4ad6f5878a Merge pull request #2393 from wallabag/api-urls-exist
Ability to check multiple urls in API
2016-10-08 13:31:31 +02:00
Nicolas Lœuillet
b840268711
Added a test to check if entries are also deleted 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
71254701b7
Changed tests 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
821bb87685
Added tests 2016-10-08 13:27:18 +02:00
Jeremy Benoist
3f3a60879e
Add entry export in API
Export isn't available for json & xml because user can use the default
entry endpoint instead.
2016-10-08 12:59:19 +02:00
Jeremy Benoist
ee32248f43
Ensure access_token are removed
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
2016-10-08 00:05:41 +02:00
Jeremy Benoist
ac8cf632bb
Ensure orphan tag are remove in API
When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it.

Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)
2016-10-07 23:31:53 +02:00
Jeremy Benoist
f0abc22d09
Ability to check multiple urls in API 2016-10-07 20:37:01 +02:00
Nicolas Lœuillet
20bf78b935 Merge pull request #2389 from wallabag/add-info-publich-articles
Added default picture if preview picture is null
2016-10-07 16:35:32 +02:00
Nicolas Lœuillet
d5c45d5288
Added default picture if preview picture is null 2016-10-07 15:21:31 +02:00
Nicolas Lœuillet
5e7786f3c4
Fixed two-factor checkbox display in user admin panel
Fix #2380
2016-10-07 14:56:26 +02:00
Nicolas Lœuillet
c8d2dcdafe Merge pull request #2383 from wallabag/add-info-publich-articles
Added OpenGraph support for public articles
2016-10-07 14:30:46 +02:00
Nicolas Lœuillet
21d82c3c5d
Added test for OpenGraph 2016-10-07 14:06:12 +02:00
Jeremy Benoist
74e1f7433a
Fix tag test 2016-10-07 07:43:48 +02:00
Jeremy Benoist
b0458874c8
Fix relations export for Entry
Tags & Annotations weren’t really well exported.
This is now fixed (+ tests)
2016-10-07 07:43:19 +02:00
Jeremy Benoist
0b174d69d7
Fix typo & add test 2016-10-05 19:30:56 +02:00
Jeremy Benoist
755ff9e835
Create config even if user is disabled
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event.
There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
2016-10-04 10:42:46 +02:00
Jeremy Benoist
c3f8b428dd
Fix parameters in API _links
We forgot to pass them to the factory
2016-10-02 15:41:08 +02:00
Jeremy Benoist
1dc3bee6b9 Merge pull request #2327 from wallabag/user-management
Add users management UI
2016-10-02 15:00:02 +02:00
Jeremy Benoist
ccc7faec09
Disabled delete button for the logged user
To avoid some bad things to happen…
2016-10-02 13:29:57 +02:00
Nicolas Lœuillet
18b8dc0e99 Merge pull request #2325 from wallabag/api-entries-exists
Add an exists endpoint in API
2016-10-02 13:17:23 +02:00
Nicolas Lœuillet
92395680b6 Merge pull request #2328 from wallabag/avoid-duplicate-url
Avoid duplicate url with accents
2016-10-02 13:14:16 +02:00
Jeremy Benoist
eb4142e0af
Remove NewUser test from Config 2016-10-02 11:09:28 +02:00
Jeremy Benoist
152fcccd44
Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
2016-10-02 11:08:53 +02:00
Jeremy Benoist
52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart
Changed quickstart layout
2016-10-02 11:06:03 +02:00
Jeremy Benoist
6e5e27ab07 Merge pull request #2324 from wallabag/edit-tagging-rule
Add ability to edit a tagging rule
2016-10-02 11:05:10 +02:00
Jeremy Benoist
bfb3ae01da Merge pull request #2323 from wallabag/footer-stats
Add simple stats in footer
2016-10-02 11:04:49 +02:00
Jeremy Benoist
24ad330be6
Update test 2016-10-02 01:47:10 +02:00
Jeremy Benoist
d6d3fb6e4c
Remove additional entry
After the test is done, cleanup what we’ve done
2016-10-02 01:42:21 +02:00
Jeremy Benoist
19ca0b2f35
Avoid duplicate url with accents 2016-10-01 18:00:11 +02:00
Jeremy Benoist
55551e332c
Add test when url doesn’t exist 2016-10-01 17:26:36 +02:00
Jeremy Benoist
6273fefd5d
Add an exists endpoint in API
It should allow third party to check if an url was already saved by a user
2016-10-01 17:15:28 +02:00
Jeremy Benoist
bf3dc999e7
Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00
Nicolas Lœuillet
c4bf7af96f Merge pull request #2322 from wallabag/v2-404
Customize errors templates
2016-10-01 16:35:48 +02:00
Jeremy Benoist
1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Jeremy Benoist
40e219622a
Customize errors templates
All error goes to the same template which only display the error message and the status code.
2016-10-01 14:58:48 +02:00
Jeremy Benoist
ca17abce2d
Create user config in one place
Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
2016-09-30 21:01:36 +02:00
Nicolas Lœuillet
084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
Jeremy Benoist
c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
Jeremy Benoist
ff1a5362f7 Add Instapaper import
Also update ImportController with latest import (chrome, firefox & instapaper).
2016-09-27 20:27:08 +02:00
Jeremy Benoist
d6de23a100 Merge pull request #2192 from wallabag/import-browser-bookmarks
Import Firefox & Chrome bookmarks into wallabag
2016-09-26 14:47:02 +02:00
Nicolas Lœuillet
fefef9d41b
Added tags for Firefox import 2016-09-26 13:40:10 +02:00
Jeremy Benoist
12d93e6896
Update Firefox file
With real data, the previous looks more than a Chrome converted file.
Also, fix date conversion (hope so).
2016-09-25 22:24:07 +02:00
Jeremy Benoist
27acc6ddb8
Fix bad date format in Browser import 2016-09-25 15:32:02 +02:00
Jeremy Benoist
f0fd82d039
Fix bad parameter for tests 2016-09-25 14:21:12 +02:00
Thomas Citharel
64b1229b2d
fix tests 2016-09-25 12:29:19 +02:00
Thomas Citharel
59201088b4
bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet
f7c55b3812
Added tests for Chrome bookmarks import 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet
06d13ddfbc
Indentation and renamed fixtures file 2016-09-25 12:28:55 +02:00
Nicolas Lœuillet
efe659ab84
Add Chrome path for Mac OS 2016-09-25 12:28:55 +02:00
Thomas Citharel
ae669126e7
Import Firefox & Chrome bookmarks into wallabag 2016-09-25 12:28:54 +02:00
Jeremy Benoist
401135852c
Use scheduled entity insertions to avoid tag duplicate
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
2016-09-25 12:03:49 +02:00
Jeremy Benoist
0e0102b6fc
Avoid failing test for user who didn’t install Redis 2016-09-24 19:57:59 +02:00
Jeremy Benoist
d7b4b2c72c
Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
Jeremy Benoist
59b97fae99
Avoid losing entry when fetching fail
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
2016-09-17 07:40:56 +02:00
Jeremy Benoist
ebe0787e09
Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Jeremy Benoist
ac87e0db2a
AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
Jeremy Benoist
47d7c682a4
Add more “real” tests 2016-09-13 22:27:27 +02:00
Jeremy Benoist
c80cc01afa
Change flash message for queued articles 2016-09-13 21:09:05 +02:00
Jeremy Benoist
886d479734
Fix tests 2016-09-11 23:57:27 +02:00
Jeremy Benoist
ebf5e5087d
Add tests on ImportCommand 2016-09-11 22:15:31 +02:00
Jeremy Benoist
015c7a8359
Add more tests
And ability to define how many messages can be hanle by the redis worker before stopping (usefull for tests)
2016-09-11 22:15:31 +02:00
Jeremy Benoist
7230e4c39f
Enable Redis on Travis
Add generated files from `composer up`
Add more articles for Readability tests
2016-09-11 21:58:57 +02:00
Jeremy Benoist
b3437d58ae
Enable Redis async import
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
2016-09-11 21:58:56 +02:00
Jeremy Benoist
7f7531171f
Retrieve created date from Pocket 2016-09-11 21:58:56 +02:00
Jeremy Benoist
13470c3596
Add test for RabbitMQ
Also update Symfony deps
2016-09-11 21:58:56 +02:00
Jeremy Benoist
6d65c0a8b0
Add ability to define created_at for all import
At the moment only Readability & wallabag v2 import allow created_at import.
Pocket removed `time_added` field from their API v2 to v3...
And wallabag v1 doesn't export that value.
2016-09-11 21:58:55 +02:00
Jeremy Benoist
02f6489572
Retrieve all items from Pocket
5000 by 5000.
Also, retrieve newest item first.
2016-09-11 21:58:31 +02:00
Jeremy Benoist
ef75e1220e
Send every imported item to the queue
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
2016-09-11 21:57:46 +02:00
Nicolas Lœuillet
40d2a29443
Replace RabbitMQ injection with CraueConfiguration 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet
56c778b415
1st draft for rabbitMQ 2016-09-11 21:57:09 +02:00
Jeremy Benoist
9401696fe4
Export dates from entries 2016-09-08 16:49:21 +02:00
Jeremy Benoist
f62c3faf88
Update test
If the database isn't found when checking for the connection it means, we can connect to the server.
The InstallCommand will create the database later.

Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite.
2016-09-03 10:34:27 +02:00
Jeremy Benoist
a1a1077059
Add tests on ReadabilityImport 2016-09-01 13:39:41 +02:00
Jeremy Benoist
ca15aaac18
Fix import count tests 2016-09-01 09:36:11 +02:00
Jeremy Benoist
03e3753f6b
Add Readability import
Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)
2016-09-01 08:00:30 +02:00
Nicolas Lœuillet
d5d1612153
Add tests for untagged entries 2016-08-28 14:44:00 +02:00
Jeremy Benoist
60e7220406 Merge pull request #1904 from wallabag/feature-public-mode
Share entry with a public URL
2016-08-25 09:30:51 +02:00
Jeremy Benoist
eddda878a0
Update test
and some cleanup
2016-08-24 22:29:36 +02:00
Jeremy Benoist
a1ab7d1d32 Merge pull request #2186 from wallabag/addRegistration
Add option to disable registration
2016-08-24 11:13:00 +02:00
Nicolas Lœuillet
8541b3c4fd
Add simple test 2016-08-24 10:28:43 +02:00
Nicolas Lœuillet
f1be7af446 Change share entry behavior 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
a7e2218e25 Add test and fix migration 2016-08-23 16:49:21 +02:00
Jeremy Benoist
a0e1eafc35
Add some tests
Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.
2016-08-23 07:26:58 +02:00
Nicolas Lœuillet
267e8d6361
Add tests for tag list routes 2016-08-23 07:26:18 +02:00
Jeremy Benoist
79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Thomas Citharel
9c545fe028
Added name on client
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
2016-08-22 20:18:27 +02:00
Jeremy Benoist
db4d63fc1a
Upgrade PHPUnit to version 5
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201
2016-08-22 20:16:50 +02:00
Jeremy Benoist
19d9efab32
Avoid breaking import when fetching fail
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
2016-08-20 01:17:26 +02:00
Jeremy Benoist
6dfac457d8 Fix tests
Ensure tests after the InstallCommand test will have a clean database.
Previous attempt failed because of a foreign key

Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures.
And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file.
2016-08-17 14:34:39 +02:00
Jeremy Benoist
0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
Thomas Citharel
28803f106b Add filter for tags on API 2016-06-29 09:55:57 +02:00
Thomas Citharel
e5fb89e5d3 Add since parameter 2016-06-25 21:05:50 +02:00
Jeremy Benoist
fdc90ceb17 Change the way to login user in tests
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport
2016-06-24 11:55:47 +02:00
Jeremy Benoist
f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist
95859e54c5 Add some tests about readingTime 2016-06-23 10:46:47 +02:00
Jeremy Benoist
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Nicolas Lœuillet
2b9fe72b39 remove foo test 2015-01-22 10:14:37 +01:00
Nicolas Lœuillet
6ad93dff69 new folders 2015-01-20 07:40:39 +01:00
Nicolas Lœuillet
f3052b4542 foo test 2015-01-19 11:59:22 +01:00