Skip to content

Commit 842382c

Browse files
committed
Add and Update tests
1 parent 2c30023 commit 842382c

12 files changed

+56
-16
lines changed

β€Žplugins/SegmentEditor/tests/Integration/SegmentEditorTest.phpβ€Ž

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public function testAddAndGetSimpleSegment()
8282
'enable_only_idsite' => '0',
8383
'auto_archive' => '0',
8484
'ts_last_edit' => null,
85+
'starred' => '0',
8586
'deleted' => '0',
8687
);
8788

@@ -112,6 +113,7 @@ public function testAddAndGetAnotherSegment()
112113
'enable_only_idsite' => '1',
113114
'auto_archive' => '1',
114115
'ts_last_edit' => null,
116+
'starred' => '0',
115117
'deleted' => '0',
116118
);
117119
unset($segment['ts_created']);
@@ -145,7 +147,7 @@ public function testUpdateSegment()
145147
$this->clearReArchiveList();
146148

147149
$updatedSegment = array(
148-
'idsegment' => $idSegment2,
150+
'idsegment' => '' . $idSegment2,
149151
'name' => 'NEW name',
150152
'definition' => 'searches==0',
151153
'hash' => md5('searches==0'),
@@ -155,6 +157,7 @@ public function testUpdateSegment()
155157
'ts_last_edit' => Date::now()->getDatetime(),
156158
'ts_created' => Date::now()->getDatetime(),
157159
'login' => Piwik::getCurrentUserLogin(),
160+
'starred' => '0',
158161
'deleted' => '0',
159162
);
160163
API::getInstance()->update(
@@ -178,11 +181,29 @@ public function testUpdateSegment()
178181

179182
$this->assertEquals($newSegment, $updatedSegment);
180183

181-
// Check the other segmenet was not updated
184+
// Check the other segment was not updated
182185
$newSegment = API::getInstance()->get($idSegment1);
183186
$this->assertEquals($newSegment['name'], $nameSegment1);
184187
}
185188

189+
public function testStarUnstarSegment()
190+
{
191+
// Set up initial conditions
192+
$idSegment = API::getInstance()->add('hello', 'searches==0');
193+
$segment = API::getInstance()->get($idSegment);
194+
$this->assertEquals('0', $segment['starred']);
195+
196+
// Star segment
197+
API::getInstance()->star($idSegment);
198+
$starredSegment = API::getInstance()->get($idSegment);
199+
$this->assertEquals('1', $starredSegment['starred']);
200+
201+
// Unstar segment
202+
API::getInstance()->unstar($idSegment);
203+
$unstarredSegment = API::getInstance()->get($idSegment);
204+
$this->assertEquals('0', $unstarredSegment['starred']);
205+
}
206+
186207
public function testDeleteSegment()
187208
{
188209
$this->expectNotToPerformAssertions();

β€Žplugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ describe("SegmentSelectorEditorTest", function () {
4646
expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('1_selector_open');
4747
});
4848

49+
it("should unstar all segments", async function() {
50+
await page.click('.segmentList li:nth-child(2) .starSegment');
51+
await page.click('.segmentList li:nth-child(3) .starSegment');
52+
await page.click('.segmentList li:nth-child(4) .starSegment');
53+
expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('1_selector_unstarred');
54+
});
55+
56+
it("should star last segment", async function() {
57+
await page.click('.segmentList li:last-child .starSegment');
58+
expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('1_selector_starred');
59+
});
60+
4961
it("should open segment editor when edit link clicked for existing segment", async function() {
5062
await page.evaluate(function() {
5163
$('.segmentList .editSegment:first').click()
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

β€Žtests/PHPUnit/Integration/Segment/SegmentUnavailableTest.phpβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ private function checkSegmentAvailable(string $definition, string $name, bool $s
172172
'auto_archive' => 1,
173173
'ts_last_edit' => null,
174174
'deleted' => 0,
175+
'starred' => 0,
175176
],
176177
];
177178
}
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
Β (0)