Skip to content

Commit 56554e6

Browse files
committed
Improve spec helpers organization
1 parent 672cccf commit 56554e6

File tree

11 files changed

+44
-54
lines changed

11 files changed

+44
-54
lines changed

spec/spec_helper.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,4 @@
7272

7373
ActiveRecord::Base.establish_connection(options)
7474

75-
load File.dirname(__FILE__) + '/support/schema.rb'
76-
load File.dirname(__FILE__) + '/support/test_helpers.rb'
77-
load File.dirname(__FILE__) + '/support/datatable_cond_date.rb'
78-
load File.dirname(__FILE__) + '/support/datatable_cond_numeric.rb'
79-
load File.dirname(__FILE__) + '/support/datatable_cond_proc.rb'
80-
load File.dirname(__FILE__) + '/support/datatable_cond_string.rb'
81-
load File.dirname(__FILE__) + '/support/datatable_cond_unknown.rb'
82-
load File.dirname(__FILE__) + '/support/datatable_order_nulls_last.rb'
83-
require File.dirname(__FILE__) + '/support/test_models.rb'
75+
Dir[File.dirname(__FILE__) + '/support/**/*.rb'].sort.each { |f| require f }
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
2+
def view_columns
3+
@view_columns ||= {
4+
username: { source: 'User.username' },
5+
email: { source: 'User.email' },
6+
first_name: { source: 'User.first_name' },
7+
last_name: { source: 'User.last_name' },
8+
post_id: { source: 'User.post_id', orderable: false },
9+
created_at: { source: 'User.created_at' },
10+
}
11+
end
12+
13+
def data
14+
records.map do |record|
15+
{
16+
username: record.username,
17+
email: record.email,
18+
first_name: record.first_name,
19+
last_name: record.last_name,
20+
post_id: record.post_id,
21+
created_at: record.created_at,
22+
}
23+
end
24+
end
25+
26+
def get_raw_records
27+
User.all
28+
end
29+
end
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
class ComplexDatatableArray < ComplexDatatable
2+
def data
3+
records.map do |record|
4+
[
5+
record.username,
6+
record.email,
7+
record.first_name,
8+
record.last_name,
9+
record.post_id,
10+
record.created_at,
11+
]
12+
end
13+
end
14+
end

spec/support/test_helpers.rb renamed to spec/support/helpers/params.rb

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -53,51 +53,6 @@ def sample_params
5353
end
5454
# rubocop:enable Metrics/MethodLength
5555

56-
class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
57-
def view_columns
58-
@view_columns ||= {
59-
username: { source: 'User.username' },
60-
email: { source: 'User.email' },
61-
first_name: { source: 'User.first_name' },
62-
last_name: { source: 'User.last_name' },
63-
post_id: { source: 'User.post_id', orderable: false },
64-
created_at: { source: 'User.created_at' },
65-
}
66-
end
67-
68-
def data
69-
records.map do |record|
70-
{
71-
username: record.username,
72-
email: record.email,
73-
first_name: record.first_name,
74-
last_name: record.last_name,
75-
post_id: record.post_id,
76-
created_at: record.created_at,
77-
}
78-
end
79-
end
80-
81-
def get_raw_records
82-
User.all
83-
end
84-
end
85-
86-
class ComplexDatatableArray < ComplexDatatable
87-
def data
88-
records.map do |record|
89-
[
90-
record.username,
91-
record.email,
92-
record.first_name,
93-
record.last_name,
94-
record.post_id,
95-
record.created_at,
96-
]
97-
end
98-
end
99-
end
100-
10156
def nulls_last_sql(datatable)
10257
case datatable.db_adapter
10358
when :pg, :postgresql, :postgres, :oracle

0 commit comments

Comments
 (0)