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.
Files changed (40) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/concerns/enju_library/controller.rb +12 -3
  3. data/app/controllers/libraries_controller.rb +1 -0
  4. data/app/controllers/shelves_controller.rb +2 -1
  5. data/app/models/library.rb +1 -1
  6. data/app/models/library_group.rb +22 -17
  7. data/app/models/shelf.rb +1 -1
  8. data/app/views/libraries/_form.html.erb +1 -0
  9. data/app/views/library_groups/_color_fields.html.erb +0 -1
  10. data/app/views/library_groups/_form.html.erb +1 -4
  11. data/config/locales/translation_en.yml +1 -0
  12. data/config/locales/translation_ja.yml +1 -0
  13. data/config/routes.rb +1 -0
  14. data/lib/enju_library/version.rb +1 -1
  15. data/lib/tasks/enju_library_tasks.rake +2 -2
  16. data/spec/controllers/accepts_controller_spec.rb +96 -96
  17. data/spec/controllers/baskets_controller_spec.rb +126 -126
  18. data/spec/controllers/bookstores_controller_spec.rb +152 -152
  19. data/spec/controllers/budget_types_controller_spec.rb +48 -49
  20. data/spec/controllers/libraries_controller_spec.rb +183 -183
  21. data/spec/controllers/library_groups_controller_spec.rb +47 -47
  22. data/spec/controllers/request_status_types_controller_spec.rb +152 -152
  23. data/spec/controllers/request_types_controller_spec.rb +152 -152
  24. data/spec/controllers/search_engines_controller_spec.rb +152 -152
  25. data/spec/controllers/shelves_controller_spec.rb +152 -152
  26. data/spec/controllers/subscribes_controller_spec.rb +151 -151
  27. data/spec/controllers/subscriptions_controller_spec.rb +152 -152
  28. data/spec/controllers/user_export_files_controller_spec.rb +75 -75
  29. data/spec/controllers/user_groups_controller_spec.rb +108 -108
  30. data/spec/controllers/user_import_files_controller_spec.rb +73 -73
  31. data/spec/controllers/user_import_results_controller_spec.rb +33 -34
  32. data/spec/controllers/withdraws_controller_spec.rb +42 -45
  33. data/spec/fixtures/libraries.yml +1 -1
  34. data/spec/fixtures/library_groups.yml +22 -17
  35. data/spec/fixtures/shelves.yml +1 -1
  36. data/spec/models/library_group_spec.rb +22 -17
  37. data/spec/models/library_spec.rb +1 -1
  38. data/spec/models/shelf_spec.rb +1 -1
  39. data/spec/views/library_groups/edit.html.erb_spec.rb +8 -0
  40. metadata +11 -25
data/spec/controllers/subscriptions_controller_spec.rb CHANGED
@@ -8,117 +8,117 @@ describe SubscriptionsController do
8
8
  FactoryGirl.attributes_for(:subscription)
9
9
  end
10
10
 
11
- describe "GET index", :solr => true do
11
+ describe 'GET index', solr: true do
12
12
  before do
13
13
  Subscription.reindex
14
14
  end
15
15
 
16
- describe "When logged in as Administrator" do
16
+ describe 'When logged in as Administrator' do
17
17
  login_fixture_admin
18
18
 
19
- it "assigns all subscriptions as @subscriptions" do
19
+ it 'assigns all subscriptions as @subscriptions' do
20
20
  get :index
21
21
  assigns(:subscriptions).should eq(Subscription.page(1))
22
22
  end
23
23
  end
24
24
 
25
- describe "When logged in as Librarian" do
25
+ describe 'When logged in as Librarian' do
26
26
  login_fixture_librarian
27
27
 
28
- it "assigns all subscriptions as @subscriptions" do
28
+ it 'assigns all subscriptions as @subscriptions' do
29
29
  get :index
30
30
  assigns(:subscriptions).should eq(Subscription.page(1))
31
31
  end
32
32
  end
33
33
 
34
- describe "When logged in as User" do
34
+ describe 'When logged in as User' do
35
35
  login_fixture_user
36
36
 
37
- it "assigns all subscriptions as @subscriptions" do
37
+ it 'assigns all subscriptions as @subscriptions' do
38
38
  get :index
39
39
  assigns(:subscriptions).should be_nil
40
40
  end
41
41
  end
42
42
 
43
- describe "When not logged in" do
44
- it "assigns all subscriptions as @subscriptions" do
43
+ describe 'When not logged in' do
44
+ it 'assigns all subscriptions as @subscriptions' do
45
45
  get :index
46
46
  assigns(:subscriptions).should be_nil
47
47
  end
48
48
  end
49
49
  end
50
50
 
51
- describe "GET show" do
52
- describe "When logged in as Administrator" do
51
+ describe 'GET show' do
52
+ describe 'When logged in as Administrator' do
53
53
  login_fixture_admin
54
54
 
55
- it "assigns the requested subscription as @subscription" do
55
+ it 'assigns the requested subscription as @subscription' do
56
56
  subscription = FactoryGirl.create(:subscription)
57
- get :show, :id => subscription.id
57
+ get :show, id: subscription.id
58
58
  assigns(:subscription).should eq(subscription)
59
59
  end
60
60
  end
61
61
 
62
- describe "When logged in as Librarian" do
62
+ describe 'When logged in as Librarian' do
63
63
  login_fixture_librarian
64
64
 
65
- it "assigns the requested subscription as @subscription" do
65
+ it 'assigns the requested subscription as @subscription' do
66
66
  subscription = FactoryGirl.create(:subscription)
67
- get :show, :id => subscription.id
67
+ get :show, id: subscription.id
68
68
  assigns(:subscription).should eq(subscription)
69
69
  end
70
70
  end
71
71
 
72
- describe "When logged in as User" do
72
+ describe 'When logged in as User' do
73
73
  login_fixture_user
74
74
 
75
- it "assigns the requested subscription as @subscription" do
75
+ it 'assigns the requested subscription as @subscription' do
76
76
  subscription = FactoryGirl.create(:subscription)
77
- get :show, :id => subscription.id
77
+ get :show, id: subscription.id
78
78
  assigns(:subscription).should eq(subscription)
79
79
  end
80
80
  end
81
81
 
82
- describe "When not logged in" do
83
- it "assigns the requested subscription as @subscription" do
82
+ describe 'When not logged in' do
83
+ it 'assigns the requested subscription as @subscription' do
84
84
  subscription = FactoryGirl.create(:subscription)
85
- get :show, :id => subscription.id
85
+ get :show, id: subscription.id
86
86
  assigns(:subscription).should eq(subscription)
87
87
  end
88
88
  end
89
89
  end
90
90
 
91
- describe "GET new" do
92
- describe "When logged in as Administrator" do
91
+ describe 'GET new' do
92
+ describe 'When logged in as Administrator' do
93
93
  login_fixture_admin
94
94
 
95
- it "assigns the requested subscription as @subscription" do
95
+ it 'assigns the requested subscription as @subscription' do
96
96
  get :new
97
97
  assigns(:subscription).should_not be_valid
98
98
  end
99
99
  end
100
100
 
101
- describe "When logged in as Librarian" do
101
+ describe 'When logged in as Librarian' do
102
102
  login_fixture_librarian
103
103
 
104
- it "assigns the requested subscription as @subscription" do
104
+ it 'assigns the requested subscription as @subscription' do
105
105
  get :new
106
106
  assigns(:subscription).should_not be_valid
107
107
  end
108
108
  end
109
109
 
110
- describe "When logged in as User" do
110
+ describe 'When logged in as User' do
111
111
  login_fixture_user
112
112
 
113
- it "should not assign the requested subscription as @subscription" do
113
+ it 'should not assign the requested subscription as @subscription' do
114
114
  get :new
115
115
  assigns(:subscription).should be_nil
116
116
  response.should be_forbidden
117
117
  end
118
118
  end
119
119
 
120
- describe "When not logged in" do
121
- it "should not assign the requested subscription as @subscription" do
120
+ describe 'When not logged in' do
121
+ it 'should not assign the requested subscription as @subscription' do
122
122
  get :new
123
123
  assigns(:subscription).should be_nil
124
124
  response.should redirect_to(new_user_session_url)
@@ -126,315 +126,315 @@ describe SubscriptionsController do
126
126
  end
127
127
  end
128
128
 
129
- describe "GET edit" do
130
- describe "When logged in as Administrator" do
129
+ describe 'GET edit' do
130
+ describe 'When logged in as Administrator' do
131
131
  login_fixture_admin
132
132
 
133
- it "assigns the requested subscription as @subscription" do
133
+ it 'assigns the requested subscription as @subscription' do
134
134
  subscription = FactoryGirl.create(:subscription)
135
- get :edit, :id => subscription.id
135
+ get :edit, id: subscription.id
136
136
  assigns(:subscription).should eq(subscription)
137
137
  end
138
138
  end
139
139
 
140
- describe "When logged in as Librarian" do
140
+ describe 'When logged in as Librarian' do
141
141
  login_fixture_librarian
142
142
 
143
- it "assigns the requested subscription as @subscription" do
143
+ it 'assigns the requested subscription as @subscription' do
144
144
  subscription = FactoryGirl.create(:subscription)
145
- get :edit, :id => subscription.id
145
+ get :edit, id: subscription.id
146
146
  assigns(:subscription).should eq(subscription)
147
147
  end
148
148
  end
149
149
 
150
- describe "When logged in as User" do
150
+ describe 'When logged in as User' do
151
151
  login_fixture_user
152
152
 
153
- it "assigns the requested subscription as @subscription" do
153
+ it 'assigns the requested subscription as @subscription' do
154
154
  subscription = FactoryGirl.create(:subscription)
155
- get :edit, :id => subscription.id
155
+ get :edit, id: subscription.id
156
156
  response.should be_forbidden
157
157
  end
158
158
  end
159
159
 
160
- describe "When not logged in" do
161
- it "should not assign the requested subscription as @subscription" do
160
+ describe 'When not logged in' do
161
+ it 'should not assign the requested subscription as @subscription' do
162
162
  subscription = FactoryGirl.create(:subscription)
163
- get :edit, :id => subscription.id
163
+ get :edit, id: subscription.id
164
164
  response.should redirect_to(new_user_session_url)
165
165
  end
166
166
  end
167
167
  end
168
168
 
169
- describe "POST create" do
169
+ describe 'POST create' do
170
170
  before(:each) do
171
171
  @attrs = valid_attributes
172
- @invalid_attrs = {:title => ''}
172
+ @invalid_attrs = { title: '' }
173
173
  end
174
174
 
175
- describe "When logged in as Administrator" do
175
+ describe 'When logged in as Administrator' do
176
176
  login_fixture_admin
177
177
 
178
- describe "with valid params" do
179
- it "assigns a newly created subscription as @subscription" do
180
- post :create, :subscription => @attrs
178
+ describe 'with valid params' do
179
+ it 'assigns a newly created subscription as @subscription' do
180
+ post :create, subscription: @attrs
181
181
  assigns(:subscription).should be_valid
182
182
  end
183
183
 
184
- it "redirects to the created subscription" do
185
- post :create, :subscription => @attrs
184
+ it 'redirects to the created subscription' do
185
+ post :create, subscription: @attrs
186
186
  response.should redirect_to(subscription_url(assigns(:subscription)))
187
187
  end
188
188
  end
189
189
 
190
- describe "with invalid params" do
191
- it "assigns a newly created but unsaved subscription as @subscription" do
192
- post :create, :subscription => @invalid_attrs
190
+ describe 'with invalid params' do
191
+ it 'assigns a newly created but unsaved subscription as @subscription' do
192
+ post :create, subscription: @invalid_attrs
193
193
  assigns(:subscription).should_not be_valid
194
194
  end
195
195
 
196
196
  it "re-renders the 'new' template" do
197
- post :create, :subscription => @invalid_attrs
198
- response.should render_template("new")
197
+ post :create, subscription: @invalid_attrs
198
+ response.should render_template('new')
199
199
  end
200
200
  end
201
201
  end
202
202
 
203
- describe "When logged in as Librarian" do
203
+ describe 'When logged in as Librarian' do
204
204
  login_fixture_librarian
205
205
 
206
- describe "with valid params" do
207
- it "assigns a newly created subscription as @subscription" do
208
- post :create, :subscription => @attrs
206
+ describe 'with valid params' do
207
+ it 'assigns a newly created subscription as @subscription' do
208
+ post :create, subscription: @attrs
209
209
  assigns(:subscription).should be_valid
210
210
  end
211
211
 
212
- it "redirects to the created subscription" do
213
- post :create, :subscription => @attrs
212
+ it 'redirects to the created subscription' do
213
+ post :create, subscription: @attrs
214
214
  response.should redirect_to(subscription_url(assigns(:subscription)))
215
215
  end
216
216
  end
217
217
 
218
- describe "with invalid params" do
219
- it "assigns a newly created but unsaved subscription as @subscription" do
220
- post :create, :subscription => @invalid_attrs
218
+ describe 'with invalid params' do
219
+ it 'assigns a newly created but unsaved subscription as @subscription' do
220
+ post :create, subscription: @invalid_attrs
221
221
  assigns(:subscription).should_not be_valid
222
222
  end
223
223
 
224
224
  it "re-renders the 'new' template" do
225
- post :create, :subscription => @invalid_attrs
226
- response.should render_template("new")
225
+ post :create, subscription: @invalid_attrs
226
+ response.should render_template('new')
227
227
  end
228
228
  end
229
229
  end
230
230
 
231
- describe "When logged in as User" do
231
+ describe 'When logged in as User' do
232
232
  login_fixture_user
233
233
 
234
- describe "with valid params" do
235
- it "assigns a newly created subscription as @subscription" do
236
- post :create, :subscription => @attrs
234
+ describe 'with valid params' do
235
+ it 'assigns a newly created subscription as @subscription' do
236
+ post :create, subscription: @attrs
237
237
  assigns(:subscription).should be_nil
238
238
  end
239
239
 
240
- it "should be forbidden" do
241
- post :create, :subscription => @attrs
240
+ it 'should be forbidden' do
241
+ post :create, subscription: @attrs
242
242
  response.should be_forbidden
243
243
  end
244
244
  end
245
245
 
246
- describe "with invalid params" do
247
- it "assigns a newly created but unsaved subscription as @subscription" do
248
- post :create, :subscription => @invalid_attrs
246
+ describe 'with invalid params' do
247
+ it 'assigns a newly created but unsaved subscription as @subscription' do
248
+ post :create, subscription: @invalid_attrs
249
249
  assigns(:subscription).should be_nil
250
250
  end
251
251
 
252
- it "should be forbidden" do
253
- post :create, :subscription => @invalid_attrs
252
+ it 'should be forbidden' do
253
+ post :create, subscription: @invalid_attrs
254
254
  response.should be_forbidden
255
255
  end
256
256
  end
257
257
  end
258
258
 
259
- describe "When not logged in" do
260
- describe "with valid params" do
261
- it "assigns a newly created subscription as @subscription" do
262
- post :create, :subscription => @attrs
259
+ describe 'When not logged in' do
260
+ describe 'with valid params' do
261
+ it 'assigns a newly created subscription as @subscription' do
262
+ post :create, subscription: @attrs
263
263
  assigns(:subscription).should be_nil
264
264
  end
265
265
 
266
- it "should be forbidden" do
267
- post :create, :subscription => @attrs
266
+ it 'should be forbidden' do
267
+ post :create, subscription: @attrs
268
268
  response.should redirect_to(new_user_session_url)
269
269
  end
270
270
  end
271
271
 
272
- describe "with invalid params" do
273
- it "assigns a newly created but unsaved subscription as @subscription" do
274
- post :create, :subscription => @invalid_attrs
272
+ describe 'with invalid params' do
273
+ it 'assigns a newly created but unsaved subscription as @subscription' do
274
+ post :create, subscription: @invalid_attrs
275
275
  assigns(:subscription).should be_nil
276
276
  end
277
277
 
278
- it "should be forbidden" do
279
- post :create, :subscription => @invalid_attrs
278
+ it 'should be forbidden' do
279
+ post :create, subscription: @invalid_attrs
280
280
  response.should redirect_to(new_user_session_url)
281
281
  end
282
282
  end
283
283
  end
284
284
  end
285
285
 
286
- describe "PUT update" do
286
+ describe 'PUT update' do
287
287
  before(:each) do
288
288
  @subscription = FactoryGirl.create(:subscription)
289
289
  @attrs = valid_attributes
290
- @invalid_attrs = {:title => ''}
290
+ @invalid_attrs = { title: '' }
291
291
  end
292
292
 
293
- describe "When logged in as Administrator" do
293
+ describe 'When logged in as Administrator' do
294
294
  login_fixture_admin
295
295
 
296
- describe "with valid params" do
297
- it "updates the requested subscription" do
298
- put :update, :id => @subscription.id, :subscription => @attrs
296
+ describe 'with valid params' do
297
+ it 'updates the requested subscription' do
298
+ put :update, id: @subscription.id, subscription: @attrs
299
299
  end
300
300
 
301
- it "assigns the requested subscription as @subscription" do
302
- put :update, :id => @subscription.id, :subscription => @attrs
301
+ it 'assigns the requested subscription as @subscription' do
302
+ put :update, id: @subscription.id, subscription: @attrs
303
303
  assigns(:subscription).should eq(@subscription)
304
304
  end
305
305
  end
306
306
 
307
- describe "with invalid params" do
308
- it "assigns the requested subscription as @subscription" do
309
- put :update, :id => @subscription.id, :subscription => @invalid_attrs
310
- response.should render_template("edit")
307
+ describe 'with invalid params' do
308
+ it 'assigns the requested subscription as @subscription' do
309
+ put :update, id: @subscription.id, subscription: @invalid_attrs
310
+ response.should render_template('edit')
311
311
  end
312
312
  end
313
313
  end
314
314
 
315
- describe "When logged in as Librarian" do
315
+ describe 'When logged in as Librarian' do
316
316
  login_fixture_librarian
317
317
 
318
- describe "with valid params" do
319
- it "updates the requested subscription" do
320
- put :update, :id => @subscription.id, :subscription => @attrs
318
+ describe 'with valid params' do
319
+ it 'updates the requested subscription' do
320
+ put :update, id: @subscription.id, subscription: @attrs
321
321
  end
322
322
 
323
- it "assigns the requested subscription as @subscription" do
324
- put :update, :id => @subscription.id, :subscription => @attrs
323
+ it 'assigns the requested subscription as @subscription' do
324
+ put :update, id: @subscription.id, subscription: @attrs
325
325
  assigns(:subscription).should eq(@subscription)
326
326
  response.should redirect_to(@subscription)
327
327
  end
328
328
  end
329
329
 
330
- describe "with invalid params" do
331
- it "assigns the subscription as @subscription" do
332
- put :update, :id => @subscription, :subscription => @invalid_attrs
330
+ describe 'with invalid params' do
331
+ it 'assigns the subscription as @subscription' do
332
+ put :update, id: @subscription, subscription: @invalid_attrs
333
333
  assigns(:subscription).should_not be_valid
334
334
  end
335
335
 
336
336
  it "re-renders the 'edit' template" do
337
- put :update, :id => @subscription, :subscription => @invalid_attrs
338
- response.should render_template("edit")
337
+ put :update, id: @subscription, subscription: @invalid_attrs
338
+ response.should render_template('edit')
339
339
  end
340
340
  end
341
341
  end
342
342
 
343
- describe "When logged in as User" do
343
+ describe 'When logged in as User' do
344
344
  login_fixture_user
345
345
 
346
- describe "with valid params" do
347
- it "updates the requested subscription" do
348
- put :update, :id => @subscription.id, :subscription => @attrs
346
+ describe 'with valid params' do
347
+ it 'updates the requested subscription' do
348
+ put :update, id: @subscription.id, subscription: @attrs
349
349
  end
350
350
 
351
- it "assigns the requested subscription as @subscription" do
352
- put :update, :id => @subscription.id, :subscription => @attrs
351
+ it 'assigns the requested subscription as @subscription' do
352
+ put :update, id: @subscription.id, subscription: @attrs
353
353
  assigns(:subscription).should eq(@subscription)
354
354
  response.should be_forbidden
355
355
  end
356
356
  end
357
357
 
358
- describe "with invalid params" do
359
- it "assigns the requested subscription as @subscription" do
360
- put :update, :id => @subscription.id, :subscription => @invalid_attrs
358
+ describe 'with invalid params' do
359
+ it 'assigns the requested subscription as @subscription' do
360
+ put :update, id: @subscription.id, subscription: @invalid_attrs
361
361
  response.should be_forbidden
362
362
  end
363
363
  end
364
364
  end
365
365
 
366
- describe "When not logged in" do
367
- describe "with valid params" do
368
- it "updates the requested subscription" do
369
- put :update, :id => @subscription.id, :subscription => @attrs
366
+ describe 'When not logged in' do
367
+ describe 'with valid params' do
368
+ it 'updates the requested subscription' do
369
+ put :update, id: @subscription.id, subscription: @attrs
370
370
  end
371
371
 
372
- it "should be forbidden" do
373
- put :update, :id => @subscription.id, :subscription => @attrs
372
+ it 'should be forbidden' do
373
+ put :update, id: @subscription.id, subscription: @attrs
374
374
  response.should redirect_to(new_user_session_url)
375
375
  end
376
376
  end
377
377
 
378
- describe "with invalid params" do
379
- it "assigns the requested subscription as @subscription" do
380
- put :update, :id => @subscription.id, :subscription => @invalid_attrs
378
+ describe 'with invalid params' do
379
+ it 'assigns the requested subscription as @subscription' do
380
+ put :update, id: @subscription.id, subscription: @invalid_attrs
381
381
  response.should redirect_to(new_user_session_url)
382
382
  end
383
383
  end
384
384
  end
385
385
  end
386
386
 
387
- describe "DELETE destroy" do
387
+ describe 'DELETE destroy' do
388
388
  before(:each) do
389
389
  @subscription = FactoryGirl.create(:subscription)
390
390
  end
391
391
 
392
- describe "When logged in as Administrator" do
392
+ describe 'When logged in as Administrator' do
393
393
  login_fixture_admin
394
394
 
395
- it "destroys the requested subscription" do
396
- delete :destroy, :id => @subscription.id
395
+ it 'destroys the requested subscription' do
396
+ delete :destroy, id: @subscription.id
397
397
  end
398
398
 
399
- it "redirects to the subscriptions list" do
400
- delete :destroy, :id => @subscription.id
399
+ it 'redirects to the subscriptions list' do
400
+ delete :destroy, id: @subscription.id
401
401
  response.should redirect_to(subscriptions_url)
402
402
  end
403
403
  end
404
404
 
405
- describe "When logged in as Librarian" do
405
+ describe 'When logged in as Librarian' do
406
406
  login_fixture_librarian
407
407
 
408
- it "destroys the requested subscription" do
409
- delete :destroy, :id => @subscription.id
408
+ it 'destroys the requested subscription' do
409
+ delete :destroy, id: @subscription.id
410
410
  end
411
411
 
412
- it "should be forbidden" do
413
- delete :destroy, :id => @subscription.id
412
+ it 'should be forbidden' do
413
+ delete :destroy, id: @subscription.id
414
414
  response.should redirect_to(subscriptions_url)
415
415
  end
416
416
  end
417
417
 
418
- describe "When logged in as User" do
418
+ describe 'When logged in as User' do
419
419
  login_fixture_user
420
420
 
421
- it "destroys the requested subscription" do
422
- delete :destroy, :id => @subscription.id
421
+ it 'destroys the requested subscription' do
422
+ delete :destroy, id: @subscription.id
423
423
  end
424
424
 
425
- it "should be forbidden" do
426
- delete :destroy, :id => @subscription.id
425
+ it 'should be forbidden' do
426
+ delete :destroy, id: @subscription.id
427
427
  response.should be_forbidden
428
428
  end
429
429
  end
430
430
 
431
- describe "When not logged in" do
432
- it "destroys the requested subscription" do
433
- delete :destroy, :id => @subscription.id
431
+ describe 'When not logged in' do
432
+ it 'destroys the requested subscription' do
433
+ delete :destroy, id: @subscription.id
434
434
  end
435
435
 
436
- it "should be forbidden" do
437
- delete :destroy, :id => @subscription.id
436
+ it 'should be forbidden' do
437
+ delete :destroy, id: @subscription.id
438
438
  response.should redirect_to(new_user_session_url)
439
439
  end
440
440
  end