Skip to content

Commit 73f6f36

Browse files
pxpmpxpm
committed
fix column tests
1 parent 3f486c2 commit 73f6f36

File tree

1 file changed

+121
-118
lines changed

1 file changed

+121
-118
lines changed

‎tests/Unit/CrudPanel/CrudPanelColumnsTest.php‎

Lines changed: 121 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -118,89 +118,91 @@ class CrudPanelColumnsTest extends BaseDBCrudPanelTest
118118

119119
private $expectedRelationColumnsArrayWithoutPro = [
120120
'accountDetails' => [
121-
'name' => 'accountDetails',
122-
'label' => 'AccountDetails',
123-
'type' => 'text',
124-
'key' => 'accountDetails',
125-
'priority' => 0,
126-
'tableColumn' => false,
127-
'orderable' => false,
128-
'searchLogic' => false,
129-
'entity' => 'accountDetails',
130-
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
121+
'name' => 'accountDetails',
122+
'label' => 'AccountDetails',
123+
'type' => 'text',
124+
'key' => 'accountDetails',
125+
'priority' => 0,
126+
'tableColumn' => false,
127+
'orderable' => false,
128+
'searchLogic' => false,
129+
'entity' => 'accountDetails',
130+
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
131131
'relation_type' => 'HasOne',
132-
'attribute' => 'nickname',
132+
'attribute' => 'nickname',
133133
],
134134
'accountDetails__nickname' => [
135-
'name' => 'accountDetails.nickname',
136-
'label' => 'AccountDetails.nickname',
137-
'type' => 'text',
138-
'key' => 'accountDetails__nickname',
139-
'priority' => 1,
140-
'attribute' => 'nickname',
141-
'tableColumn' => false,
142-
'orderable' => false,
143-
'searchLogic' => false,
135+
'name' => 'accountDetails.nickname',
136+
'label' => 'AccountDetails.nickname',
137+
'type' => 'text',
138+
'key' => 'accountDetails__nickname',
139+
'priority' => 1,
140+
'attribute' => 'nickname',
141+
'tableColumn' => false,
142+
'orderable' => false,
143+
'searchLogic' => false,
144144
'relation_type' => 'HasOne',
145-
'entity' => 'accountDetails.nickname',
146-
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
145+
'entity' => 'accountDetails.nickname',
146+
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
147147
],
148148
'accountDetails__user' => [
149-
'name' => 'accountDetails.user',
150-
'label' => 'AccountDetails.user',
151-
'type' => 'select',
152-
'key' => 'accountDetails__user',
153-
'priority' => 2,
154-
'tableColumn' => false,
155-
'orderable' => false,
156-
'searchLogic' => false,
149+
'name' => 'accountDetails.user',
150+
'label' => 'AccountDetails.user',
151+
'type' => 'select',
152+
'key' => 'accountDetails__user',
153+
'priority' => 2,
154+
'tableColumn' => false,
155+
'orderable' => false,
156+
'searchLogic' => false,
157157
'relation_type' => 'BelongsTo',
158-
'entity' => 'accountDetails.user',
159-
'model' => 'Backpack\CRUD\Tests\Unit\Models\User',
160-
'attribute' => 'name',
158+
'entity' => 'accountDetails.user',
159+
'model' => 'Backpack\CRUD\Tests\Unit\Models\User',
160+
'attribute' => 'name',
161161
],
162162
];
163163

164164
private $expectedRelationColumnsArrayWithPro = [
165165
'accountDetails' => [
166-
'name' => 'accountDetails',
167-
'label' => 'AccountDetails',
168-
'type' => 'relationship',
169-
'key' => 'accountDetails',
170-
'priority' => 0,
171-
'tableColumn' => false,
172-
'orderable' => false,
173-
'searchLogic' => false,
174-
'entity' => 'accountDetails',
175-
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
166+
'name' => 'accountDetails',
167+
'label' => 'AccountDetails',
168+
'type' => 'relationship',
169+
'key' => 'accountDetails',
170+
'priority' => 0,
171+
'tableColumn' => false,
172+
'orderable' => false,
173+
'searchLogic' => false,
174+
'entity' => 'accountDetails',
175+
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
176176
'relation_type' => 'HasOne',
177+
'attribute' => 'nickname',
177178
],
178179
'accountDetails__nickname' => [
179-
'name' => 'accountDetails.nickname',
180-
'label' => 'AccountDetails.nickname',
181-
'type' => 'relationship',
182-
'key' => 'accountDetails__nickname',
183-
'priority' => 1,
184-
'attribute' => 'nickname',
185-
'tableColumn' => false,
186-
'orderable' => false,
187-
'searchLogic' => false,
180+
'name' => 'accountDetails.nickname',
181+
'label' => 'AccountDetails.nickname',
182+
'type' => 'relationship',
183+
'key' => 'accountDetails__nickname',
184+
'priority' => 1,
185+
'attribute' => 'nickname',
186+
'tableColumn' => false,
187+
'orderable' => false,
188+
'searchLogic' => false,
188189
'relation_type' => 'HasOne',
189-
'entity' => 'accountDetails.nickname',
190-
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
190+
'entity' => 'accountDetails.nickname',
191+
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
191192
],
192193
'accountDetails__user' => [
193-
'name' => 'accountDetails.user',
194-
'label' => 'AccountDetails.user',
195-
'type' => 'relationship',
196-
'key' => 'accountDetails__user',
197-
'priority' => 2,
198-
'tableColumn' => false,
199-
'orderable' => false,
200-
'searchLogic' => false,
194+
'name' => 'accountDetails.user',
195+
'label' => 'AccountDetails.user',
196+
'type' => 'relationship',
197+
'key' => 'accountDetails__user',
198+
'priority' => 2,
199+
'tableColumn' => false,
200+
'orderable' => false,
201+
'searchLogic' => false,
201202
'relation_type' => 'BelongsTo',
202-
'entity' => 'accountDetails.user',
203-
'model' => 'Backpack\CRUD\Tests\Unit\Models\User',
203+
'entity' => 'accountDetails.user',
204+
'model' => 'Backpack\CRUD\Tests\Unit\Models\User',
205+
'attribute' => 'name',
204206
],
205207
];
206208

@@ -213,17 +215,17 @@ class CrudPanelColumnsTest extends BaseDBCrudPanelTest
213215

214216
private $expectedRelationColumnArray = [
215217
'nickname' => [
216-
'name' => 'nickname',
217-
'type' => 'select',
218-
'entity' => 'accountDetails',
219-
'attribute' => 'nickname',
220-
'label' => 'Nickname',
221-
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
222-
'key' => 'nickname',
223-
'tableColumn' => false,
224-
'orderable' => false,
225-
'searchLogic' => false,
226-
'priority' => 0,
218+
'name' => 'nickname',
219+
'type' => 'select',
220+
'entity' => 'accountDetails',
221+
'attribute' => 'nickname',
222+
'label' => 'Nickname',
223+
'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
224+
'key' => 'nickname',
225+
'tableColumn' => false,
226+
'orderable' => false,
227+
'searchLogic' => false,
228+
'priority' => 0,
227229
'relation_type' => 'HasOne',
228230
],
229231
];
@@ -240,62 +242,63 @@ class CrudPanelColumnsTest extends BaseDBCrudPanelTest
240242

241243
private $expectedNestedRelationColumnArrayWithPro = [
242244
'accountDetails__article' => [
243-
'name' => 'accountDetails.article',
244-
'type' => 'relationship',
245-
'entity' => 'accountDetails.article',
246-
'label' => 'AccountDetails.article',
247-
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
248-
'key' => 'accountDetails__article',
249-
'tableColumn' => false,
250-
'orderable' => false,
251-
'searchLogic' => false,
252-
'priority' => 0,
245+
'name' => 'accountDetails.article',
246+
'type' => 'relationship',
247+
'entity' => 'accountDetails.article',
248+
'label' => 'AccountDetails.article',
249+
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
250+
'key' => 'accountDetails__article',
251+
'tableColumn' => false,
252+
'orderable' => false,
253+
'searchLogic' => false,
254+
'priority' => 0,
253255
'relation_type' => 'BelongsTo',
256+
'attribute' => 'content',
254257
],
255258
'ac_article_content' => [
256-
'name' => 'accountDetails.article',
257-
'type' => 'relationship',
258-
'entity' => 'accountDetails.article',
259-
'label' => 'AccountDetails.article',
260-
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
261-
'key' => 'ac_article_content',
262-
'tableColumn' => false,
263-
'orderable' => false,
264-
'searchLogic' => false,
265-
'priority' => 1,
259+
'name' => 'accountDetails.article',
260+
'type' => 'relationship',
261+
'entity' => 'accountDetails.article',
262+
'label' => 'AccountDetails.article',
263+
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
264+
'key' => 'ac_article_content',
265+
'tableColumn' => false,
266+
'orderable' => false,
267+
'searchLogic' => false,
268+
'priority' => 1,
266269
'relation_type' => 'BelongsTo',
267-
'attribute' => 'content',
270+
'attribute' => 'content',
268271
],
269272
];
270273

271274
private $expectedNestedRelationColumnArrayWithoutPro = [
272275
'accountDetails__article' => [
273-
'name' => 'accountDetails.article',
274-
'type' => 'select',
275-
'entity' => 'accountDetails.article',
276-
'label' => 'AccountDetails.article',
277-
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
278-
'key' => 'accountDetails__article',
279-
'tableColumn' => false,
280-
'orderable' => false,
281-
'searchLogic' => false,
282-
'priority' => 0,
276+
'name' => 'accountDetails.article',
277+
'type' => 'select',
278+
'entity' => 'accountDetails.article',
279+
'label' => 'AccountDetails.article',
280+
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
281+
'key' => 'accountDetails__article',
282+
'tableColumn' => false,
283+
'orderable' => false,
284+
'searchLogic' => false,
285+
'priority' => 0,
283286
'relation_type' => 'BelongsTo',
284-
'attribute' => 'content',
287+
'attribute' => 'content',
285288
],
286289
'ac_article_content' => [
287-
'name' => 'accountDetails.article',
288-
'type' => 'select',
289-
'entity' => 'accountDetails.article',
290-
'label' => 'AccountDetails.article',
291-
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
292-
'key' => 'ac_article_content',
293-
'tableColumn' => false,
294-
'orderable' => false,
295-
'searchLogic' => false,
296-
'priority' => 1,
290+
'name' => 'accountDetails.article',
291+
'type' => 'select',
292+
'entity' => 'accountDetails.article',
293+
'label' => 'AccountDetails.article',
294+
'model' => 'Backpack\CRUD\Tests\Unit\Models\Article',
295+
'key' => 'ac_article_content',
296+
'tableColumn' => false,
297+
'orderable' => false,
298+
'searchLogic' => false,
299+
'priority' => 1,
297300
'relation_type' => 'BelongsTo',
298-
'attribute' => 'content',
301+
'attribute' => 'content',
299302
],
300303
];
301304

0 commit comments

Comments
 (0)