enju_library 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/concerns/enju_library/controller.rb +12 -3
- data/app/controllers/libraries_controller.rb +1 -0
- data/app/controllers/shelves_controller.rb +2 -1
- data/app/models/library.rb +1 -1
- data/app/models/library_group.rb +22 -17
- data/app/models/shelf.rb +1 -1
- data/app/views/libraries/_form.html.erb +1 -0
- data/app/views/library_groups/_color_fields.html.erb +0 -1
- data/app/views/library_groups/_form.html.erb +1 -4
- data/config/locales/translation_en.yml +1 -0
- data/config/locales/translation_ja.yml +1 -0
- data/config/routes.rb +1 -0
- data/lib/enju_library/version.rb +1 -1
- data/lib/tasks/enju_library_tasks.rake +2 -2
- data/spec/controllers/accepts_controller_spec.rb +96 -96
- data/spec/controllers/baskets_controller_spec.rb +126 -126
- data/spec/controllers/bookstores_controller_spec.rb +152 -152
- data/spec/controllers/budget_types_controller_spec.rb +48 -49
- data/spec/controllers/libraries_controller_spec.rb +183 -183
- data/spec/controllers/library_groups_controller_spec.rb +47 -47
- data/spec/controllers/request_status_types_controller_spec.rb +152 -152
- data/spec/controllers/request_types_controller_spec.rb +152 -152
- data/spec/controllers/search_engines_controller_spec.rb +152 -152
- data/spec/controllers/shelves_controller_spec.rb +152 -152
- data/spec/controllers/subscribes_controller_spec.rb +151 -151
- data/spec/controllers/subscriptions_controller_spec.rb +152 -152
- data/spec/controllers/user_export_files_controller_spec.rb +75 -75
- data/spec/controllers/user_groups_controller_spec.rb +108 -108
- data/spec/controllers/user_import_files_controller_spec.rb +73 -73
- data/spec/controllers/user_import_results_controller_spec.rb +33 -34
- data/spec/controllers/withdraws_controller_spec.rb +42 -45
- data/spec/fixtures/libraries.yml +1 -1
- data/spec/fixtures/library_groups.yml +22 -17
- data/spec/fixtures/shelves.yml +1 -1
- data/spec/models/library_group_spec.rb +22 -17
- data/spec/models/library_spec.rb +1 -1
- data/spec/models/shelf_spec.rb +1 -1
- data/spec/views/library_groups/edit.html.erb_spec.rb +8 -0
- metadata +11 -25
@@ -24,117 +24,114 @@ RSpec.describe WithdrawsController, type: :controller do
|
|
24
24
|
# This should return the minimal set of attributes required to create a valid
|
25
25
|
# Withdraw. As you add validations to Withdraw, be sure to
|
26
26
|
# adjust the attributes here as well.
|
27
|
-
let(:valid_attributes)
|
27
|
+
let(:valid_attributes) do
|
28
28
|
FactoryGirl.build(:withdraw).attributes.with_indifferent_access
|
29
|
-
|
30
|
-
let(:invalid_attributes)
|
29
|
+
end
|
30
|
+
let(:invalid_attributes) do
|
31
31
|
{ item_id: nil }
|
32
|
-
|
33
|
-
let(:valid_create_attributes)
|
32
|
+
end
|
33
|
+
let(:valid_create_attributes) do
|
34
34
|
{ basket_id: Basket.find(valid_attributes[:basket_id]).id,
|
35
|
-
withdraw: { item_identifier: Item.find(valid_attributes[:item_id]).item_identifier }
|
36
|
-
|
37
|
-
}
|
35
|
+
withdraw: { item_identifier: Item.find(valid_attributes[:item_id]).item_identifier }}
|
36
|
+
end
|
38
37
|
|
39
38
|
# This should return the minimal set of values that should be in the session
|
40
39
|
# in order to pass any filters (e.g. authentication) defined in
|
41
40
|
# WithdrawsController. Be sure to keep this updated too.
|
42
41
|
let(:valid_session) { {} }
|
43
42
|
|
44
|
-
describe
|
45
|
-
describe
|
43
|
+
describe 'GET #index' do
|
44
|
+
describe 'When logged in as Administrator' do
|
46
45
|
login_fixture_admin
|
47
|
-
it
|
48
|
-
|
46
|
+
it 'assigns all withdraws as @withdraws' do
|
47
|
+
Withdraw.create! valid_attributes
|
49
48
|
get :index, basket_id: 1
|
50
49
|
expect(assigns(:withdraws)).to eq baskets(:basket_00001).withdraws.order('withdraws.created_at DESC').page(1)
|
51
50
|
end
|
52
51
|
end
|
53
52
|
end
|
54
53
|
|
55
|
-
describe
|
56
|
-
describe
|
54
|
+
describe 'GET #show' do
|
55
|
+
describe 'When logged in as Administrator' do
|
57
56
|
login_fixture_admin
|
58
|
-
it
|
57
|
+
it 'assigns the requested withdraw as @withdraw' do
|
59
58
|
withdraw = Withdraw.create! valid_attributes
|
60
|
-
get :show,
|
59
|
+
get :show, id: withdraw.to_param
|
61
60
|
expect(assigns(:withdraw)).to eq(withdraw)
|
62
61
|
response.should be_success
|
63
62
|
end
|
64
63
|
end
|
65
64
|
end
|
66
65
|
|
67
|
-
describe
|
68
|
-
describe
|
66
|
+
describe 'GET #new' do
|
67
|
+
describe 'When logged in as Administrator' do
|
69
68
|
login_fixture_admin
|
70
|
-
it
|
71
|
-
get :new
|
69
|
+
it 'assigns a new withdraw as @withdraw' do
|
70
|
+
get :new
|
72
71
|
expect(assigns(:withdraw)).to be_a_new(Withdraw)
|
73
72
|
end
|
74
73
|
end
|
75
74
|
end
|
76
75
|
|
77
|
-
describe
|
78
|
-
describe
|
76
|
+
describe 'POST #create' do
|
77
|
+
describe 'When logged in as Administrator' do
|
79
78
|
login_fixture_admin
|
80
|
-
context
|
81
|
-
it
|
82
|
-
expect
|
79
|
+
context 'with valid params' do
|
80
|
+
it 'creates a new Withdraw' do
|
81
|
+
expect do
|
83
82
|
post :create, valid_create_attributes
|
84
|
-
|
83
|
+
end.to change(Withdraw, :count).by(1)
|
85
84
|
expect(assigns(:withdraw)).to be_persisted
|
86
85
|
end
|
87
86
|
|
88
|
-
it
|
87
|
+
it 'assigns a newly created withdraw as @withdraw' do
|
89
88
|
post :create, valid_create_attributes
|
90
89
|
expect(assigns(:withdraw)).to be_a(Withdraw)
|
91
90
|
expect(assigns(:withdraw)).to be_persisted
|
92
91
|
end
|
93
92
|
|
94
|
-
it
|
93
|
+
it 'redirects to the created withdraw' do
|
95
94
|
post :create, valid_create_attributes
|
96
95
|
expect(response).to redirect_to(withdraws_path(basket_id: valid_create_attributes[:basket_id]))
|
97
96
|
end
|
98
97
|
|
99
|
-
it
|
100
|
-
post :create,
|
98
|
+
it 'should not withdraw a checked-out item' do
|
99
|
+
post :create, basket_id: valid_create_attributes[:basket_id],
|
101
100
|
withdraw: { item_identifier: '00001' }
|
102
|
-
}
|
103
101
|
expect(assigns(:withdraw)).to be_a(Withdraw)
|
104
102
|
expect(response).to be_success
|
105
103
|
end
|
106
104
|
end
|
107
105
|
|
108
|
-
context
|
109
|
-
it
|
110
|
-
post :create,
|
106
|
+
context 'with invalid params' do
|
107
|
+
it 'assigns a newly created but unsaved withdraw as @withdraw' do
|
108
|
+
post :create, basket_id: valid_create_attributes[:basket_id], withdraw: { item_id: nil }
|
111
109
|
expect(assigns(:withdraw)).to be_a_new(Withdraw)
|
112
110
|
end
|
113
111
|
|
114
112
|
it "re-renders the 'new' template" do
|
115
|
-
post :create,
|
116
|
-
expect(response).to render_template(
|
113
|
+
post :create, basket_id: valid_create_attributes[:basket_id], withdraw: { item_id: nil }
|
114
|
+
expect(response).to render_template('index')
|
117
115
|
end
|
118
116
|
end
|
119
117
|
end
|
120
118
|
end
|
121
119
|
|
122
|
-
describe
|
123
|
-
describe
|
120
|
+
describe 'DELETE #destroy' do
|
121
|
+
describe 'When logged in as Administrator' do
|
124
122
|
login_fixture_admin
|
125
|
-
it
|
123
|
+
it 'destroys the requested withdraw' do
|
126
124
|
withdraw = Withdraw.create! valid_attributes
|
127
|
-
expect
|
128
|
-
delete :destroy,
|
129
|
-
|
125
|
+
expect do
|
126
|
+
delete :destroy, id: withdraw.to_param
|
127
|
+
end.to change(Withdraw, :count).by(-1)
|
130
128
|
end
|
131
129
|
|
132
|
-
it
|
130
|
+
it 'redirects to the withdraws list' do
|
133
131
|
withdraw = Withdraw.create! valid_attributes
|
134
|
-
delete :destroy,
|
132
|
+
delete :destroy, id: withdraw.to_param
|
135
133
|
expect(response).to redirect_to(withdraws_url)
|
136
134
|
end
|
137
135
|
end
|
138
136
|
end
|
139
|
-
|
140
137
|
end
|
data/spec/fixtures/libraries.yml
CHANGED
@@ -87,7 +87,7 @@ library_00004:
|
|
87
87
|
# note :text
|
88
88
|
# call_number_rows :integer default(1), not null
|
89
89
|
# call_number_delimiter :string default("|"), not null
|
90
|
-
# library_group_id :integer
|
90
|
+
# library_group_id :integer not null
|
91
91
|
# users_count :integer default(0), not null
|
92
92
|
# position :integer
|
93
93
|
# country_id :integer
|
@@ -19,21 +19,26 @@ one:
|
|
19
19
|
#
|
20
20
|
# Table name: library_groups
|
21
21
|
#
|
22
|
-
# id
|
23
|
-
# name
|
24
|
-
# display_name
|
25
|
-
# short_name
|
26
|
-
# my_networks
|
27
|
-
# login_banner
|
28
|
-
# note
|
29
|
-
# country_id
|
30
|
-
# position
|
31
|
-
# created_at
|
32
|
-
# updated_at
|
33
|
-
# admin_networks
|
34
|
-
# allow_bookmark_external_url
|
35
|
-
# url
|
36
|
-
# settings
|
37
|
-
# html_snippet
|
38
|
-
#
|
22
|
+
# id :integer not null, primary key
|
23
|
+
# name :string not null
|
24
|
+
# display_name :text
|
25
|
+
# short_name :string not null
|
26
|
+
# my_networks :text
|
27
|
+
# login_banner :text
|
28
|
+
# note :text
|
29
|
+
# country_id :integer
|
30
|
+
# position :integer
|
31
|
+
# created_at :datetime
|
32
|
+
# updated_at :datetime
|
33
|
+
# admin_networks :text
|
34
|
+
# allow_bookmark_external_url :boolean default(FALSE), not null
|
35
|
+
# url :string default("http://localhost:3000/")
|
36
|
+
# settings :text
|
37
|
+
# html_snippet :text
|
38
|
+
# book_jacket_source :string
|
39
|
+
# max_number_of_results :integer default(500)
|
40
|
+
# family_name_first :boolean default(TRUE)
|
41
|
+
# screenshot_generator :string
|
42
|
+
# pub_year_facet_range_interval :integer default(10)
|
43
|
+
# user_id :integer
|
39
44
|
#
|
data/spec/fixtures/shelves.yml
CHANGED
@@ -19,21 +19,26 @@ end
|
|
19
19
|
#
|
20
20
|
# Table name: library_groups
|
21
21
|
#
|
22
|
-
# id
|
23
|
-
# name
|
24
|
-
# display_name
|
25
|
-
# short_name
|
26
|
-
# my_networks
|
27
|
-
# login_banner
|
28
|
-
# note
|
29
|
-
# country_id
|
30
|
-
# position
|
31
|
-
# created_at
|
32
|
-
# updated_at
|
33
|
-
# admin_networks
|
34
|
-
# allow_bookmark_external_url
|
35
|
-
# url
|
36
|
-
# settings
|
37
|
-
# html_snippet
|
38
|
-
#
|
22
|
+
# id :integer not null, primary key
|
23
|
+
# name :string not null
|
24
|
+
# display_name :text
|
25
|
+
# short_name :string not null
|
26
|
+
# my_networks :text
|
27
|
+
# login_banner :text
|
28
|
+
# note :text
|
29
|
+
# country_id :integer
|
30
|
+
# position :integer
|
31
|
+
# created_at :datetime
|
32
|
+
# updated_at :datetime
|
33
|
+
# admin_networks :text
|
34
|
+
# allow_bookmark_external_url :boolean default(FALSE), not null
|
35
|
+
# url :string default("http://localhost:3000/")
|
36
|
+
# settings :text
|
37
|
+
# html_snippet :text
|
38
|
+
# book_jacket_source :string
|
39
|
+
# max_number_of_results :integer default(500)
|
40
|
+
# family_name_first :boolean default(TRUE)
|
41
|
+
# screenshot_generator :string
|
42
|
+
# pub_year_facet_range_interval :integer default(10)
|
43
|
+
# user_id :integer
|
39
44
|
#
|
data/spec/models/library_spec.rb
CHANGED
@@ -32,7 +32,7 @@ end
|
|
32
32
|
# note :text
|
33
33
|
# call_number_rows :integer default(1), not null
|
34
34
|
# call_number_delimiter :string default("|"), not null
|
35
|
-
# library_group_id :integer
|
35
|
+
# library_group_id :integer not null
|
36
36
|
# users_count :integer default(0), not null
|
37
37
|
# position :integer
|
38
38
|
# country_id :integer
|
data/spec/models/shelf_spec.rb
CHANGED
@@ -12,6 +12,14 @@ describe "library_groups/edit" do
|
|
12
12
|
expect(rendered).to have_css "select#library_group_book_jacket_source"
|
13
13
|
expect(rendered).to have_css "select#library_group_book_jacket_source option", minimum: 2
|
14
14
|
expect(rendered).to have_css 'select#library_group_book_jacket_source option[value="google"]'
|
15
|
+
expect(rendered).to have_css 'select#library_group_book_jacket_source option[value="openbd"]'
|
15
16
|
expect(rendered).to have_css 'select#library_group_book_jacket_source option[value="hanmotocom"]'
|
16
17
|
end
|
18
|
+
|
19
|
+
it "renders color forms." do
|
20
|
+
render
|
21
|
+
expect(rendered).to have_css "input#library_group_colors_attributes_0_code"
|
22
|
+
expect(rendered).not_to have_css "input#library_group_colors_attributes_0__destroy", visible: false
|
23
|
+
expect(rendered).not_to have_xpath '//a[@data-association="color" and @class="add_fields"]'
|
24
|
+
end
|
17
25
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_library
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2017-03-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: enju_seed
|
@@ -142,56 +142,56 @@ dependencies:
|
|
142
142
|
requirements:
|
143
143
|
- - "~>"
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version: 0.2.0
|
145
|
+
version: 0.2.0
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - "~>"
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 0.2.0
|
152
|
+
version: 0.2.0
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: enju_ndl
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - "~>"
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 0.2.0
|
159
|
+
version: 0.2.0
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - "~>"
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: 0.2.0
|
166
|
+
version: 0.2.0
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: enju_event
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
171
|
- - "~>"
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: 0.2.0
|
173
|
+
version: 0.2.0
|
174
174
|
type: :development
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
178
|
- - "~>"
|
179
179
|
- !ruby/object:Gem::Version
|
180
|
-
version: 0.2.0
|
180
|
+
version: 0.2.0
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: enju_circulation
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
185
|
- - "~>"
|
186
186
|
- !ruby/object:Gem::Version
|
187
|
-
version: 0.2.0
|
187
|
+
version: 0.2.0
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
192
|
- - "~>"
|
193
193
|
- !ruby/object:Gem::Version
|
194
|
-
version: 0.2.0
|
194
|
+
version: 0.2.0
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: sqlite3
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
@@ -276,20 +276,6 @@ dependencies:
|
|
276
276
|
- - '='
|
277
277
|
- !ruby/object:Gem::Version
|
278
278
|
version: 2.2.0
|
279
|
-
- !ruby/object:Gem::Dependency
|
280
|
-
name: annotate
|
281
|
-
requirement: !ruby/object:Gem::Requirement
|
282
|
-
requirements:
|
283
|
-
- - ">="
|
284
|
-
- !ruby/object:Gem::Version
|
285
|
-
version: '0'
|
286
|
-
type: :development
|
287
|
-
prerelease: false
|
288
|
-
version_requirements: !ruby/object:Gem::Requirement
|
289
|
-
requirements:
|
290
|
-
- - ">="
|
291
|
-
- !ruby/object:Gem::Version
|
292
|
-
version: '0'
|
293
279
|
- !ruby/object:Gem::Dependency
|
294
280
|
name: simplecov
|
295
281
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1011,7 +997,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1011
997
|
version: '0'
|
1012
998
|
requirements: []
|
1013
999
|
rubyforge_project:
|
1014
|
-
rubygems_version: 2.5.
|
1000
|
+
rubygems_version: 2.5.2
|
1015
1001
|
signing_key:
|
1016
1002
|
specification_version: 4
|
1017
1003
|
summary: enju_library plugin
|