diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 17:40:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-07 17:40:17 +0200 |
commit | b4189928f84758e1589715dfe04e2d966a4f3b88 (patch) | |
tree | f17b8fa91fe8244fed7a913d64ce3220551916ff /tests/api/controllers/HistoryTest.php | |
parent | a4af59f47103a3f9c903eeddb1e30ab9cb7344f0 (diff) | |
parent | b86aeccf6a99a9617c66cded7252a33b1df560cd (diff) | |
download | Shaarli-b4189928f84758e1589715dfe04e2d966a4f3b88.tar.gz Shaarli-b4189928f84758e1589715dfe04e2d966a4f3b88.tar.zst Shaarli-b4189928f84758e1589715dfe04e2d966a4f3b88.zip |
Merge pull request #858 from ArthurHoaro/api/history-entries
Add history entries for API endpoint
Diffstat (limited to 'tests/api/controllers/HistoryTest.php')
-rw-r--r-- | tests/api/controllers/HistoryTest.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/api/controllers/HistoryTest.php b/tests/api/controllers/HistoryTest.php index 21e9c0ba..61046d97 100644 --- a/tests/api/controllers/HistoryTest.php +++ b/tests/api/controllers/HistoryTest.php | |||
@@ -30,11 +30,6 @@ class HistoryTest extends \PHPUnit_Framework_TestCase | |||
30 | protected $refHistory = null; | 30 | protected $refHistory = null; |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * @var \History instance. | ||
34 | */ | ||
35 | protected $history; | ||
36 | |||
37 | /** | ||
38 | * @var Container instance. | 33 | * @var Container instance. |
39 | */ | 34 | */ |
40 | protected $container; | 35 | protected $container; |
@@ -52,10 +47,10 @@ class HistoryTest extends \PHPUnit_Framework_TestCase | |||
52 | $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); | 47 | $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); |
53 | $this->refHistory = new \ReferenceHistory(); | 48 | $this->refHistory = new \ReferenceHistory(); |
54 | $this->refHistory->write(self::$testHistory); | 49 | $this->refHistory->write(self::$testHistory); |
55 | $this->conf->set('resource.history', self::$testHistory); | ||
56 | $this->container = new Container(); | 50 | $this->container = new Container(); |
57 | $this->container['conf'] = $this->conf; | 51 | $this->container['conf'] = $this->conf; |
58 | $this->container['db'] = true; | 52 | $this->container['db'] = true; |
53 | $this->container['history'] = new \History(self::$testHistory); | ||
59 | 54 | ||
60 | $this->controller = new History($this->container); | 55 | $this->controller = new History($this->container); |
61 | } | 56 | } |