Skip to content

Commit ec950b9

Browse files
denisdulicidenisdulici
committed
fixed tests
1 parent 4636e94 commit ec950b9

File tree

6 files changed

+108
-114
lines changed

6 files changed

+108
-114
lines changed

‎.github/workflows/tests.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Tests
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
tests:
7+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }}
8+
9+
runs-on: ubuntu-latest
10+
11+
strategy:
12+
matrix:
13+
php: ['8.0', '8.1']
14+
laravel: [8.*, 9.*]
15+
stability: [prefer-lowest, prefer-stable]
16+
include:
17+
- laravel: 8.*
18+
testbench: ^6.6
19+
- laravel: 9.*
20+
testbench: 7.*
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v3
25+
26+
- name: Setup PHP
27+
uses: shivammathur/setup-php@v2
28+
with:
29+
php-version: ${{ matrix.php }}
30+
extensions: bcmath, ctype, dom, fileinfo, intl, gd, json, mbstring, pdo, pdo_sqlite, openssl, sqlite, xml, zip
31+
coverage: none
32+
33+
- name: Install dependencies
34+
run: |
35+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
36+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
37+
- name: Execute tests
38+
run: vendor/bin/phpunit

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
}
2121
],
2222
"require": {
23-
"php": ">=8.0",
23+
"php": "^8.0",
2424
"ext-json": "*",
2525
"balping/json-raw-encoder": "^1.0",
2626
"illuminate/support": ">=8.0"
2727
},
2828
"require-dev": {
29-
"phpunit/phpunit": ">=9.0",
30-
"orchestra/testbench": ">=6.0"
29+
"phpunit/phpunit":"^9.5",
30+
"orchestra/testbench": "^6.23|^7.4"
3131
},
3232
"autoload": {
3333
"psr-4": {

‎src/Options/PlotOptions.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,18 @@ public function getRadialBar(): array
227227
{
228228
return $this->radialBar;
229229
}
230+
231+
public function setHorizontal(bool $horizontal): Chart
232+
{
233+
$this->setBar([
234+
'horizontal' => $horizontal,
235+
]);
236+
237+
return $this;
238+
}
239+
240+
public function getHorizontal(): bool
241+
{
242+
return $this->getBar()['horizontal'];
243+
}
230244
}

‎src/Types/HorizontalBar.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ public function __construct()
1313

1414
$this->setType('bar');
1515

16-
$this->setBar([
17-
'horizontal' => true,
18-
]);
16+
$this->setHorizontal(true);
1917
}
2018

2119
public function addBar(string $name, array|Collection $data): HorizontalBar

‎tests/Feature/ChartsTest.php

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -14,96 +14,96 @@ class ChartsTest extends TestCase
1414
public function it_tests_apexcharts_can_render_pie_charts_by_default()
1515
{
1616
$chart = (new Chart)->setTitle('Users Test Chart');
17-
$this->assertEquals('donut', $chart->type());
17+
$this->assertEquals('line', $chart->getType());
1818

19-
$anotherChart = (new Chart)->areaChart();
20-
$this->assertEquals('area', $anotherChart->type());
19+
$anotherChart = (new Chart)->setType('area');
20+
$this->assertEquals('area', $anotherChart->getType());
2121
}
2222

2323
/** @test */
2424
public function it_tests_apexcharts_can_render_pie_chart()
2525
{
26-
$chart = (new Chart)->pieChart()
26+
$chart = (new Chart)->setType('pie')
2727
->setTitle('Posts')
2828
->setSubtitle('From January To March')
2929
->setLabels(['Product One', 'Product Two', 'Product Three'])
30-
->setXAxis(['Jan', 'Feb', 'Mar'])
31-
->setDataset([150, 120]);
30+
->setSeries(['Jan', 'Feb', 'Mar'])
31+
->setDataset('posts', 'pie', [150, 120]);
3232

3333
$this->assertEquals($chart, $chart->script()['chart']);
34-
$this->assertEquals('pie', $chart->type());
34+
$this->assertEquals('pie', $chart->getType());
3535
}
3636

3737
/** @test */
3838
public function it_tests_apexcharts_can_render_donut_chart()
3939
{
40-
$chart = (new Chart)->donutChart()
40+
$chart = (new Chart)->setType('donut')
4141
->setTitle('Posts')
42-
->setXAxis(['Jan', 'Feb', 'Mar'])
43-
->setDataset([150, 120]);
42+
->setSeries(['Jan', 'Feb', 'Mar'])
43+
->setDataset('posts', 'donut', [150, 120]);
4444

4545
$this->assertEquals($chart, $chart->script()['chart']);
46-
$this->assertEquals('donut', $chart->type());
46+
$this->assertEquals('donut', $chart->getType());
4747
}
4848

4949
/** @test */
5050
public function it_tests_larapex_can_render_radial_bar_charts()
5151
{
52-
$chart = (new Chart)->radialChart()
52+
$chart = (new Chart)->setType('radial')
5353
->setTitle('Products with more profit')
54-
->setXAxis(['Jan', 'Feb', 'Mar'])
55-
->setDataset([60, 40, 79]);
54+
->setSeries(['Jan', 'Feb', 'Mar'])
55+
->setDataset('products', 'radial', [60, 40, 79]);
5656

5757
$this->assertEquals($chart, $chart->script()['chart']);
58-
$this->assertEquals('radialBar', $chart->type());
58+
$this->assertEquals('radial', $chart->getType());
5959
}
6060

6161
/** @test */
6262
public function it_tests_apexcharts_can_render_polar_chart()
6363
{
64-
$chart = (new Chart)->polarAreaChart()
64+
$chart = (new Chart)->setType('polarArea')
6565
->setTitle('Products with more profit')
66-
->setXAxis(['Jan', 'Feb', 'Mar'])
67-
->setDataset([60, 40, 79]);
66+
->setSeries(['Jan', 'Feb', 'Mar'])
67+
->setDataset('polarArea', 'radial', [60, 40, 79]);
6868

6969
$this->assertEquals($chart, $chart->script()['chart']);
70-
$this->assertEquals('polarArea', $chart->type());
70+
$this->assertEquals('polarArea', $chart->getType());
7171
}
7272

7373
/** @test */
7474
public function larapex_can_render_line_charts()
7575
{
76-
$chart = (new Chart)->lineChart()
76+
$chart = (new Chart)->setType('line')
7777
->setTitle('Total Users Monthly')
7878
->setSubtitle('From January to March')
79-
->setXAxis([
79+
->setSeries([
8080
'Jan', 'Feb', 'Mar'
8181
])
82-
->setDataset([
82+
->setDataset('line', 'users', [
8383
[
8484
'name' => 'Active Users',
8585
'data' => [250, 700, 1200]
8686
]
8787
])
8888
->setHeight(250)
89-
->setGrid(true)
90-
->setStroke(1);
89+
->setGridShow(true)
90+
->setStrokeShow(true);
9191

92-
$this->assertEquals($chart->id(), $chart->container()['id']);
92+
$this->assertEquals($chart->getId(), $chart->container()['chart']->getId());
9393
$this->assertEquals($chart, $chart->script()['chart']);
94-
$this->assertEquals('line', $chart->type());
94+
$this->assertEquals('line', $chart->getType());
9595
}
9696

9797
/** @test */
9898
public function it_tests_apexcharts_can_create_an_area_chart()
9999
{
100-
$chart = (new Chart)->areaChart()
100+
$chart = (new Chart)->setType('area')
101101
->setTitle('Total Users Monthly')
102102
->setSubtitle('From January to March')
103-
->setXAxis([
103+
->setSeries([
104104
'Jan', 'Feb', 'Mar'
105105
])
106-
->setDataset([
106+
->setDataset('area', 'users', [
107107
[
108108
'name' => 'Active Users',
109109
'data' => [250, 700, 1200]
@@ -114,18 +114,18 @@ public function it_tests_apexcharts_can_create_an_area_chart()
114114
]
115115
]);
116116

117-
$this->assertEquals($chart->id(), $chart->container()['id']);
117+
$this->assertEquals($chart->getId(), $chart->container()['chart']->getId());
118118
$this->assertEquals($chart, $chart->script()['chart']);
119-
$this->assertEquals('area', $chart->type());
119+
$this->assertEquals('area', $chart->getType());
120120
}
121121

122122
/** @test */
123123
public function it_tests_apexcharts_can_render_bar_charts()
124124
{
125-
$chart = (new Chart)->barChart()
125+
$chart = (new Chart)->setType('bar')
126126
->setTitle('Net Profit')
127-
->setXAxis(['Jan', 'Feb', 'Mar'])
128-
->setDataset([
127+
->setSeries(['Jan', 'Feb', 'Mar'])
128+
->setDataset('bar', 'profit', [
129129
[
130130
'name' => 'Company A',
131131
'data' => [500, 1000, 1900]
@@ -152,19 +152,19 @@ public function it_tests_apexcharts_can_render_bar_charts()
152152
]
153153
]);
154154

155-
$this->assertEquals($chart->id(), $chart->container()['id']);
155+
$this->assertEquals($chart->getId(), $chart->container()['chart']->getId());
156156
$this->assertEquals($chart, $chart->script()['chart']);
157-
$this->assertEquals('bar', $chart->type());
157+
$this->assertEquals('bar', $chart->getType());
158158
}
159159

160160
/** @test */
161161
public function it_tests_apexcharts_can_render_horizontal_bar_chart()
162162
{
163-
$chart = (new Chart)->barChart()
163+
$chart = (new Chart)->setType('bar')
164164
->setTitle('Net Profit')
165165
->setHorizontal(true)
166-
->setXAxis(['Jan', 'Feb', 'Mar'])
167-
->setDataset([
166+
->setSeries(['Jan', 'Feb', 'Mar'])
167+
->setDataset('bar', 'profit', [
168168
[
169169
'name' => 'Company A',
170170
'data' => [500, 1000, 1900]
@@ -179,22 +179,21 @@ public function it_tests_apexcharts_can_render_horizontal_bar_chart()
179179
]
180180
]);
181181

182-
$this->assertEquals($chart->id(), $chart->container()['id']);
182+
$this->assertEquals($chart->getId(), $chart->container()['chart']->getId());
183183
$this->assertEquals($chart, $chart->script()['chart']);
184-
$this->assertEquals('bar', $chart->type());
185-
$chartHorizontalOrientation = json_decode($chart->horizontal(), 1)['horizontal'];
186-
$this->assertTrue($chartHorizontalOrientation);
184+
$this->assertEquals('bar', $chart->getType());
185+
$this->assertTrue($chart->getHorizontal());
187186
}
188187

189188
/** @test */
190189
public function it_tests_apexcharts_can_render_heatmap_chart()
191190
{
192-
$chart = (new Chart)->heatMapChart()
191+
$chart = (new Chart)->setType('heatmap')
193192
->setTitle('Total Users')
194-
->setXAxis([
193+
->setSeries([
195194
'Jan', 'Feb', 'Mar'
196195
])
197-
->setDataset([
196+
->setDataset('heatmap', 'users', [
198197
[
199198
'name' => 'Users of Basic Plan',
200199
'data' => [250, 700, 1200]
@@ -205,20 +204,20 @@ public function it_tests_apexcharts_can_render_heatmap_chart()
205204
]
206205
]);
207206

208-
$this->assertEquals($chart->id(), $chart->container()['id']);
207+
$this->assertEquals($chart->getId(), $chart->container()['chart']->getId());
209208
$this->assertEquals($chart, $chart->script()['chart']);
210-
$this->assertEquals('heatmap', $chart->type());
209+
$this->assertEquals('heatmap', $chart->getType());
211210
}
212211

213212
/** @test */
214213
public function it_tests_apexcharts_can_render_radar_chart()
215214
{
216-
$chart = (new Chart)->radarChart()
215+
$chart = (new Chart)->setType('radar')
217216
->setTitle('Total Users')
218-
->setXAxis([
217+
->setSeries([
219218
'Jan', 'Feb', 'Mar'
220219
])
221-
->setDataset([
220+
->setDataset('radar', 'users', [
222221
[
223222
'name' => 'Users of Basic Plan',
224223
'data' => [250, 700, 1200]
@@ -229,8 +228,8 @@ public function it_tests_apexcharts_can_render_radar_chart()
229228
]
230229
]);
231230

232-
$this->assertEquals($chart->id(), $chart->container()['id']);
231+
$this->assertEquals($chart->getId(), $chart->container()['chart']->getId());
233232
$this->assertEquals($chart, $chart->script()['chart']);
234-
$this->assertEquals('radar', $chart->type());
233+
$this->assertEquals('radar', $chart->getType());
235234
}
236235
}

‎tests/Unit/ChartsTest.php

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)