enju_biblio 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 (76) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/icons/book.png +0 -0
  3. data/app/assets/images/icons/cd.png +0 -0
  4. data/app/assets/images/icons/dvd.png +0 -0
  5. data/app/assets/images/icons/monitor.png +0 -0
  6. data/app/controllers/carrier_types_controller.rb +8 -3
  7. data/app/controllers/manifestations_controller.rb +17 -4
  8. data/app/controllers/picture_files_controller.rb +1 -1
  9. data/app/controllers/series_statements_controller.rb +6 -0
  10. data/app/helpers/manifestations_helper.rb +1 -1
  11. data/app/models/agent_import_file_transition.rb +1 -0
  12. data/app/models/carrier_type.rb +11 -7
  13. data/app/models/import_request_transition.rb +1 -0
  14. data/app/models/manifestation.rb +5 -0
  15. data/app/models/resource_export_file_transition.rb +1 -0
  16. data/app/models/resource_import_file_transition.rb +1 -0
  17. data/app/views/carrier_types/index.html.erb +4 -1
  18. data/app/views/manifestations/_show_detail_librarian.html.erb +4 -0
  19. data/app/views/manifestations/index.html.erb +3 -0
  20. data/config/locales/translation_en.yml +2 -0
  21. data/config/locales/translation_ja.yml +2 -0
  22. data/lib/enju_biblio/biblio_helper.rb +1 -12
  23. data/lib/enju_biblio/version.rb +1 -1
  24. data/lib/generators/enju_biblio/setup/templates/config/schedule.rb +3 -3
  25. data/lib/tasks/carrier_type.rb +30 -18
  26. data/lib/tasks/enju_biblio_tasks.rake +2 -0
  27. data/spec/controllers/agent_import_files_controller_spec.rb +87 -87
  28. data/spec/controllers/agent_import_results_controller_spec.rb +22 -22
  29. data/spec/controllers/agent_merge_lists_controller_spec.rb +157 -157
  30. data/spec/controllers/agent_merges_controller_spec.rb +151 -151
  31. data/spec/controllers/agent_relationship_types_controller_spec.rb +152 -152
  32. data/spec/controllers/agent_relationships_controller_spec.rb +153 -153
  33. data/spec/controllers/agent_types_controller_spec.rb +49 -50
  34. data/spec/controllers/agents_controller_spec.rb +234 -234
  35. data/spec/controllers/carrier_types_controller_spec.rb +123 -103
  36. data/spec/controllers/content_types_controller_spec.rb +51 -52
  37. data/spec/controllers/countries_controller_spec.rb +156 -156
  38. data/spec/controllers/create_types_controller_spec.rb +48 -49
  39. data/spec/controllers/creates_controller_spec.rb +154 -154
  40. data/spec/controllers/donates_controller_spec.rb +153 -153
  41. data/spec/controllers/form_of_works_controller_spec.rb +48 -49
  42. data/spec/controllers/frequencies_controller_spec.rb +51 -52
  43. data/spec/controllers/identifier_types_controller_spec.rb +48 -49
  44. data/spec/controllers/import_requests_controller_spec.rb +165 -164
  45. data/spec/controllers/items_controller_spec.rb +214 -216
  46. data/spec/controllers/languages_controller_spec.rb +109 -109
  47. data/spec/controllers/licenses_controller_spec.rb +48 -49
  48. data/spec/controllers/manifestation_relationship_types_controller_spec.rb +152 -152
  49. data/spec/controllers/manifestation_relationships_controller_spec.rb +153 -153
  50. data/spec/controllers/manifestations_controller_spec.rb +319 -289
  51. data/spec/controllers/medium_of_performances_controller_spec.rb +48 -49
  52. data/spec/controllers/owns_controller_spec.rb +153 -153
  53. data/spec/controllers/picture_files_controller_spec.rb +156 -156
  54. data/spec/controllers/produce_types_controller_spec.rb +48 -49
  55. data/spec/controllers/produces_controller_spec.rb +154 -154
  56. data/spec/controllers/realize_types_controller_spec.rb +48 -49
  57. data/spec/controllers/realizes_controller_spec.rb +155 -155
  58. data/spec/controllers/resource_export_files_controller_spec.rb +72 -72
  59. data/spec/controllers/resource_import_files_controller_spec.rb +90 -90
  60. data/spec/controllers/resource_import_results_controller_spec.rb +43 -43
  61. data/spec/controllers/series_statement_merge_lists_controller_spec.rb +153 -153
  62. data/spec/controllers/series_statement_merges_controller_spec.rb +151 -151
  63. data/spec/controllers/series_statements_controller_spec.rb +154 -154
  64. data/spec/factories/checkout.rb +9 -0
  65. data/spec/factories/library.rb +13 -0
  66. data/spec/factories/shelf.rb +6 -0
  67. data/spec/fixtures/carrier_types.yml +11 -7
  68. data/spec/models/carrier_type_spec.rb +11 -7
  69. data/spec/models/resource_export_file_spec.rb +58 -16
  70. data/spec/support/resque.rb +0 -1
  71. data/spec/views/manifestations/show.html.erb_spec.rb +5 -0
  72. data/spec/views/resource_import_files/index.html.erb_spec.rb +1 -1
  73. data/spec/views/resource_import_files/show.html.erb_spec.rb +1 -1
  74. data/spec/views/resource_import_results/index.html.erb_spec.rb +1 -1
  75. data/spec/views/resource_import_results/show.html.erb_spec.rb +1 -1
  76. metadata +49 -39
@@ -4,37 +4,37 @@ require 'rails_helper'
4
4
  describe AgentImportResultsController do
5
5
  fixtures :all
6
6
 
7
- describe "GET index" do
8
- describe "When logged in as Administrator" do
7
+ describe 'GET index' do
8
+ describe 'When logged in as Administrator' do
9
9
  login_fixture_admin
10
10
 
11
- it "assigns all agent_import_results as @agent_import_results" do
11
+ it 'assigns all agent_import_results as @agent_import_results' do
12
12
  get :index
13
13
  expect(assigns(:agent_import_results)).to eq(AgentImportResult.page(1))
14
14
  end
15
15
  end
16
16
 
17
- describe "When logged in as Librarian" do
17
+ describe 'When logged in as Librarian' do
18
18
  login_fixture_librarian
19
19
 
20
- it "assigns all agent_import_results as @agent_import_results" do
20
+ it 'assigns all agent_import_results as @agent_import_results' do
21
21
  get :index
22
22
  expect(assigns(:agent_import_results)).to eq(AgentImportResult.page(1))
23
23
  end
24
24
  end
25
25
 
26
- describe "When logged in as User" do
26
+ describe 'When logged in as User' do
27
27
  login_fixture_user
28
28
 
29
- it "assigns empty as @agent_import_results" do
29
+ it 'assigns empty as @agent_import_results' do
30
30
  get :index
31
31
  expect(assigns(:agent_import_results)).to be_nil
32
32
  expect(response).to be_forbidden
33
33
  end
34
34
  end
35
35
 
36
- describe "When not logged in" do
37
- it "assigns empty as @agent_import_results" do
36
+ describe 'When not logged in' do
37
+ it 'assigns empty as @agent_import_results' do
38
38
  get :index
39
39
  expect(assigns(:agent_import_results)).to be_nil
40
40
  expect(response).to redirect_to(new_user_session_url)
@@ -42,37 +42,37 @@ describe AgentImportResultsController do
42
42
  end
43
43
  end
44
44
 
45
- describe "GET show" do
46
- describe "When logged in as Administrator" do
45
+ describe 'GET show' do
46
+ describe 'When logged in as Administrator' do
47
47
  login_fixture_admin
48
48
 
49
- it "assigns the requested agent_import_result as @agent_import_result" do
50
- get :show, :id => 1
49
+ it 'assigns the requested agent_import_result as @agent_import_result' do
50
+ get :show, id: 1
51
51
  expect(assigns(:agent_import_result)).to eq(AgentImportResult.find(1))
52
52
  end
53
53
  end
54
54
 
55
- describe "When logged in as Librarian" do
55
+ describe 'When logged in as Librarian' do
56
56
  login_fixture_librarian
57
57
 
58
- it "assigns the requested agent_import_result as @agent_import_result" do
59
- get :show, :id => 1
58
+ it 'assigns the requested agent_import_result as @agent_import_result' do
59
+ get :show, id: 1
60
60
  expect(assigns(:agent_import_result)).to eq(AgentImportResult.find(1))
61
61
  end
62
62
  end
63
63
 
64
- describe "When logged in as User" do
64
+ describe 'When logged in as User' do
65
65
  login_fixture_user
66
66
 
67
- it "assigns the requested agent_import_result as @agent_import_result" do
68
- get :show, :id => 1
67
+ it 'assigns the requested agent_import_result as @agent_import_result' do
68
+ get :show, id: 1
69
69
  expect(assigns(:agent_import_result)).to eq(AgentImportResult.find(1))
70
70
  end
71
71
  end
72
72
 
73
- describe "When not logged in" do
74
- it "assigns the requested agent_import_result as @agent_import_result" do
75
- get :show, :id => 1
73
+ describe 'When not logged in' do
74
+ it 'assigns the requested agent_import_result as @agent_import_result' do
75
+ get :show, id: 1
76
76
  expect(assigns(:agent_import_result)).to eq(AgentImportResult.find(1))
77
77
  expect(response).to redirect_to(new_user_session_url)
78
78
  end
@@ -5,117 +5,117 @@ describe AgentMergeListsController do
5
5
  fixtures :all
6
6
  disconnect_sunspot
7
7
 
8
- describe "GET index" do
9
- describe "When logged in as Administrator" do
8
+ describe 'GET index' do
9
+ describe 'When logged in as Administrator' do
10
10
  login_admin
11
11
 
12
- it "assigns all agent_merge_lists as @agent_merge_lists" do
12
+ it 'assigns all agent_merge_lists as @agent_merge_lists' do
13
13
  get :index
14
14
  assigns(:agent_merge_lists).should eq(AgentMergeList.page(1))
15
15
  end
16
16
  end
17
17
 
18
- describe "When logged in as Librarian" do
18
+ describe 'When logged in as Librarian' do
19
19
  login_librarian
20
20
 
21
- it "assigns all agent_merge_lists as @agent_merge_lists" do
21
+ it 'assigns all agent_merge_lists as @agent_merge_lists' do
22
22
  get :index
23
23
  assigns(:agent_merge_lists).should eq(AgentMergeList.page(1))
24
24
  end
25
25
  end
26
26
 
27
- describe "When logged in as User" do
27
+ describe 'When logged in as User' do
28
28
  login_user
29
29
 
30
- it "assigns empty as @agent_merge_lists" do
30
+ it 'assigns empty as @agent_merge_lists' do
31
31
  get :index
32
32
  assigns(:agent_merge_lists).should be_nil
33
33
  end
34
34
  end
35
35
 
36
- describe "When not logged in" do
37
- it "assigns empty as @agent_merge_lists" do
36
+ describe 'When not logged in' do
37
+ it 'assigns empty as @agent_merge_lists' do
38
38
  get :index
39
39
  assigns(:agent_merge_lists).should be_nil
40
40
  end
41
41
  end
42
42
  end
43
43
 
44
- describe "GET show" do
44
+ describe 'GET show' do
45
45
  before(:each) do
46
46
  @agent_merge_list = FactoryGirl.create(:agent_merge_list)
47
47
  end
48
48
 
49
- describe "When logged in as Administrator" do
49
+ describe 'When logged in as Administrator' do
50
50
  login_admin
51
51
 
52
- it "assigns the requested agent_merge_list as @agent_merge_list" do
53
- get :show, :id => @agent_merge_list.id
52
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
53
+ get :show, id: @agent_merge_list.id
54
54
  assigns(:agent_merge_list).should eq(@agent_merge_list)
55
55
  response.should be_success
56
56
  end
57
57
  end
58
58
 
59
- describe "When logged in as Librarian" do
59
+ describe 'When logged in as Librarian' do
60
60
  login_librarian
61
61
 
62
- it "assigns the requested agent_merge_list as @agent_merge_list" do
63
- get :show, :id => @agent_merge_list.id
62
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
63
+ get :show, id: @agent_merge_list.id
64
64
  assigns(:agent_merge_list).should eq(@agent_merge_list)
65
65
  response.should be_success
66
66
  end
67
67
  end
68
68
 
69
- describe "When logged in as User" do
69
+ describe 'When logged in as User' do
70
70
  login_user
71
71
 
72
- it "assigns the requested agent_merge_list as @agent_merge_list" do
73
- get :show, :id => @agent_merge_list.id
72
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
73
+ get :show, id: @agent_merge_list.id
74
74
  assigns(:agent_merge_list).should eq(@agent_merge_list)
75
75
  response.should be_forbidden
76
76
  end
77
77
  end
78
78
 
79
- describe "When not logged in" do
80
- it "assigns the requested agent_merge_list as @agent_merge_list" do
81
- get :show, :id => @agent_merge_list.id
79
+ describe 'When not logged in' do
80
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
81
+ get :show, id: @agent_merge_list.id
82
82
  assigns(:agent_merge_list).should eq(@agent_merge_list)
83
83
  response.should redirect_to new_user_session_url
84
84
  end
85
85
  end
86
86
  end
87
87
 
88
- describe "GET new" do
89
- describe "When logged in as Administrator" do
88
+ describe 'GET new' do
89
+ describe 'When logged in as Administrator' do
90
90
  login_admin
91
91
 
92
- it "assigns the requested agent_merge_list as @agent_merge_list" do
92
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
93
93
  get :new
94
94
  assigns(:agent_merge_list).should_not be_valid
95
95
  end
96
96
  end
97
97
 
98
- describe "When logged in as Librarian" do
98
+ describe 'When logged in as Librarian' do
99
99
  login_librarian
100
100
 
101
- it "assigns the requested agent_merge_list as @agent_merge_list" do
101
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
102
102
  get :new
103
103
  assigns(:agent_merge_list).should_not be_valid
104
104
  end
105
105
  end
106
106
 
107
- describe "When logged in as User" do
107
+ describe 'When logged in as User' do
108
108
  login_user
109
109
 
110
- it "should not assign the requested agent_merge_list as @agent_merge_list" do
110
+ it 'should not assign the requested agent_merge_list as @agent_merge_list' do
111
111
  get :new
112
112
  assigns(:agent_merge_list).should be_nil
113
113
  response.should be_forbidden
114
114
  end
115
115
  end
116
116
 
117
- describe "When not logged in" do
118
- it "should not assign the requested agent_merge_list as @agent_merge_list" do
117
+ describe 'When not logged in' do
118
+ it 'should not assign the requested agent_merge_list as @agent_merge_list' do
119
119
  get :new
120
120
  assigns(:agent_merge_list).should be_nil
121
121
  response.should redirect_to(new_user_session_url)
@@ -123,332 +123,332 @@ describe AgentMergeListsController do
123
123
  end
124
124
  end
125
125
 
126
- describe "GET edit" do
127
- describe "When logged in as Administrator" do
126
+ describe 'GET edit' do
127
+ describe 'When logged in as Administrator' do
128
128
  login_admin
129
129
 
130
- it "assigns the requested agent_merge_list as @agent_merge_list" do
130
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
131
131
  agent_merge_list = FactoryGirl.create(:agent_merge_list)
132
- get :edit, :id => agent_merge_list.id
132
+ get :edit, id: agent_merge_list.id
133
133
  assigns(:agent_merge_list).should eq(agent_merge_list)
134
134
  end
135
135
  end
136
136
 
137
- describe "When logged in as Librarian" do
137
+ describe 'When logged in as Librarian' do
138
138
  login_librarian
139
139
 
140
- it "assigns the requested agent_merge_list as @agent_merge_list" do
140
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
141
141
  agent_merge_list = FactoryGirl.create(:agent_merge_list)
142
- get :edit, :id => agent_merge_list.id
142
+ get :edit, id: agent_merge_list.id
143
143
  assigns(:agent_merge_list).should eq(agent_merge_list)
144
144
  end
145
145
  end
146
146
 
147
- describe "When logged in as User" do
147
+ describe 'When logged in as User' do
148
148
  login_user
149
149
 
150
- it "assigns the requested agent_merge_list as @agent_merge_list" do
150
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
151
151
  agent_merge_list = FactoryGirl.create(:agent_merge_list)
152
- get :edit, :id => agent_merge_list.id
152
+ get :edit, id: agent_merge_list.id
153
153
  response.should be_forbidden
154
154
  end
155
155
  end
156
156
 
157
- describe "When not logged in" do
158
- it "should not assign the requested agent_merge_list as @agent_merge_list" do
157
+ describe 'When not logged in' do
158
+ it 'should not assign the requested agent_merge_list as @agent_merge_list' do
159
159
  agent_merge_list = FactoryGirl.create(:agent_merge_list)
160
- get :edit, :id => agent_merge_list.id
160
+ get :edit, id: agent_merge_list.id
161
161
  response.should redirect_to(new_user_session_url)
162
162
  end
163
163
  end
164
164
  end
165
165
 
166
- describe "POST create" do
166
+ describe 'POST create' do
167
167
  before(:each) do
168
168
  @attrs = FactoryGirl.attributes_for(:agent_merge_list)
169
- @invalid_attrs = {:title => ''}
169
+ @invalid_attrs = { title: '' }
170
170
  end
171
171
 
172
- describe "When logged in as Administrator" do
172
+ describe 'When logged in as Administrator' do
173
173
  login_admin
174
174
 
175
- describe "with valid params" do
176
- it "assigns a newly created agent_merge_list as @agent_merge_list" do
177
- post :create, :agent_merge_list => @attrs
175
+ describe 'with valid params' do
176
+ it 'assigns a newly created agent_merge_list as @agent_merge_list' do
177
+ post :create, agent_merge_list: @attrs
178
178
  assigns(:agent_merge_list).should be_valid
179
179
  end
180
180
 
181
- it "redirects to the created agent_merge_list" do
182
- post :create, :agent_merge_list => @attrs
181
+ it 'redirects to the created agent_merge_list' do
182
+ post :create, agent_merge_list: @attrs
183
183
  response.should redirect_to(agent_merge_list_url(assigns(:agent_merge_list)))
184
184
  end
185
185
  end
186
186
 
187
- describe "with invalid params" do
188
- it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
189
- post :create, :agent_merge_list => @invalid_attrs
187
+ describe 'with invalid params' do
188
+ it 'assigns a newly created but unsaved agent_merge_list as @agent_merge_list' do
189
+ post :create, agent_merge_list: @invalid_attrs
190
190
  assigns(:agent_merge_list).should_not be_valid
191
191
  end
192
192
 
193
193
  it "re-renders the 'new' template" do
194
- post :create, :agent_merge_list => @invalid_attrs
195
- response.should render_template("new")
194
+ post :create, agent_merge_list: @invalid_attrs
195
+ response.should render_template('new')
196
196
  end
197
197
  end
198
198
  end
199
199
 
200
- describe "When logged in as Librarian" do
200
+ describe 'When logged in as Librarian' do
201
201
  login_librarian
202
202
 
203
- describe "with valid params" do
204
- it "assigns a newly created agent_merge_list as @agent_merge_list" do
205
- post :create, :agent_merge_list => @attrs
203
+ describe 'with valid params' do
204
+ it 'assigns a newly created agent_merge_list as @agent_merge_list' do
205
+ post :create, agent_merge_list: @attrs
206
206
  assigns(:agent_merge_list).should be_valid
207
207
  end
208
208
 
209
- it "redirects to the created agent_merge_list" do
210
- post :create, :agent_merge_list => @attrs
209
+ it 'redirects to the created agent_merge_list' do
210
+ post :create, agent_merge_list: @attrs
211
211
  response.should redirect_to(agent_merge_list_url(assigns(:agent_merge_list)))
212
212
  end
213
213
  end
214
214
 
215
- describe "with invalid params" do
216
- it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
217
- post :create, :agent_merge_list => @invalid_attrs
215
+ describe 'with invalid params' do
216
+ it 'assigns a newly created but unsaved agent_merge_list as @agent_merge_list' do
217
+ post :create, agent_merge_list: @invalid_attrs
218
218
  assigns(:agent_merge_list).should_not be_valid
219
219
  end
220
220
 
221
221
  it "re-renders the 'new' template" do
222
- post :create, :agent_merge_list => @invalid_attrs
223
- response.should render_template("new")
222
+ post :create, agent_merge_list: @invalid_attrs
223
+ response.should render_template('new')
224
224
  end
225
225
  end
226
226
  end
227
227
 
228
- describe "When logged in as User" do
228
+ describe 'When logged in as User' do
229
229
  login_user
230
230
 
231
- describe "with valid params" do
232
- it "assigns a newly created agent_merge_list as @agent_merge_list" do
233
- post :create, :agent_merge_list => @attrs
231
+ describe 'with valid params' do
232
+ it 'assigns a newly created agent_merge_list as @agent_merge_list' do
233
+ post :create, agent_merge_list: @attrs
234
234
  assigns(:agent_merge_list).should be_nil
235
235
  end
236
236
 
237
- it "should be forbidden" do
238
- post :create, :agent_merge_list => @attrs
237
+ it 'should be forbidden' do
238
+ post :create, agent_merge_list: @attrs
239
239
  response.should be_forbidden
240
240
  end
241
241
  end
242
242
 
243
- describe "with invalid params" do
244
- it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
245
- post :create, :agent_merge_list => @invalid_attrs
243
+ describe 'with invalid params' do
244
+ it 'assigns a newly created but unsaved agent_merge_list as @agent_merge_list' do
245
+ post :create, agent_merge_list: @invalid_attrs
246
246
  assigns(:agent_merge_list).should be_nil
247
247
  end
248
248
 
249
- it "should be forbidden" do
250
- post :create, :agent_merge_list => @invalid_attrs
249
+ it 'should be forbidden' do
250
+ post :create, agent_merge_list: @invalid_attrs
251
251
  response.should be_forbidden
252
252
  end
253
253
  end
254
254
  end
255
255
 
256
- describe "When not logged in" do
257
- describe "with valid params" do
258
- it "assigns a newly created agent_merge_list as @agent_merge_list" do
259
- post :create, :agent_merge_list => @attrs
256
+ describe 'When not logged in' do
257
+ describe 'with valid params' do
258
+ it 'assigns a newly created agent_merge_list as @agent_merge_list' do
259
+ post :create, agent_merge_list: @attrs
260
260
  assigns(:agent_merge_list).should be_nil
261
261
  end
262
262
 
263
- it "should be forbidden" do
264
- post :create, :agent_merge_list => @attrs
263
+ it 'should be forbidden' do
264
+ post :create, agent_merge_list: @attrs
265
265
  response.should redirect_to(new_user_session_url)
266
266
  end
267
267
  end
268
268
 
269
- describe "with invalid params" do
270
- it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
271
- post :create, :agent_merge_list => @invalid_attrs
269
+ describe 'with invalid params' do
270
+ it 'assigns a newly created but unsaved agent_merge_list as @agent_merge_list' do
271
+ post :create, agent_merge_list: @invalid_attrs
272
272
  assigns(:agent_merge_list).should be_nil
273
273
  end
274
274
 
275
- it "should be forbidden" do
276
- post :create, :agent_merge_list => @invalid_attrs
275
+ it 'should be forbidden' do
276
+ post :create, agent_merge_list: @invalid_attrs
277
277
  response.should redirect_to(new_user_session_url)
278
278
  end
279
279
  end
280
280
  end
281
281
  end
282
282
 
283
- describe "PUT update" do
283
+ describe 'PUT update' do
284
284
  before(:each) do
285
285
  @agent_merge_list = FactoryGirl.create(:agent_merge_list)
286
286
  @attrs = FactoryGirl.attributes_for(:agent_merge_list)
287
- @invalid_attrs = {:title => ''}
287
+ @invalid_attrs = { title: '' }
288
288
  end
289
289
 
290
- describe "When logged in as Administrator" do
290
+ describe 'When logged in as Administrator' do
291
291
  login_admin
292
292
 
293
- describe "with valid params" do
294
- it "updates the requested agent_merge_list" do
295
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
293
+ describe 'with valid params' do
294
+ it 'updates the requested agent_merge_list' do
295
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
296
296
  end
297
297
 
298
- it "assigns the requested agent_merge_list as @agent_merge_list" do
299
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
298
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
299
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
300
300
  assigns(:agent_merge_list).should eq(@agent_merge_list)
301
301
  response.should redirect_to(@agent_merge_list)
302
302
  end
303
303
  end
304
304
 
305
- describe "with invalid params" do
306
- it "assigns the requested agent_merge_list as @agent_merge_list" do
307
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
305
+ describe 'with invalid params' do
306
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
307
+ put :update, id: @agent_merge_list.id, agent_merge_list: @invalid_attrs
308
308
  end
309
309
 
310
310
  it "re-renders the 'edit' template" do
311
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
312
- response.should render_template("edit")
311
+ put :update, id: @agent_merge_list.id, agent_merge_list: @invalid_attrs
312
+ response.should render_template('edit')
313
313
  end
314
314
  end
315
315
  end
316
316
 
317
- describe "When logged in as Librarian" do
317
+ describe 'When logged in as Librarian' do
318
318
  login_librarian
319
319
 
320
- describe "with valid params" do
321
- it "updates the requested agent_merge_list" do
322
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
320
+ describe 'with valid params' do
321
+ it 'updates the requested agent_merge_list' do
322
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
323
323
  end
324
324
 
325
- it "assigns the requested agent_merge_list as @agent_merge_list" do
326
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
325
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
326
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
327
327
  assigns(:agent_merge_list).should eq(@agent_merge_list)
328
328
  response.should redirect_to(@agent_merge_list)
329
329
  end
330
330
  end
331
331
 
332
- describe "with invalid params" do
333
- it "assigns the agent_merge_list as @agent_merge_list" do
334
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
332
+ describe 'with invalid params' do
333
+ it 'assigns the agent_merge_list as @agent_merge_list' do
334
+ put :update, id: @agent_merge_list.id, agent_merge_list: @invalid_attrs
335
335
  assigns(:agent_merge_list).should_not be_valid
336
336
  end
337
337
 
338
338
  it "re-renders the 'edit' template" do
339
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
340
- response.should render_template("edit")
339
+ put :update, id: @agent_merge_list.id, agent_merge_list: @invalid_attrs
340
+ response.should render_template('edit')
341
341
  end
342
342
  end
343
343
 
344
- it "should not merge agents without selected_agent_id" do
345
- put :update, :id => agent_merge_lists(:agent_merge_list_00001).id, :mode => 'merge'
344
+ it 'should not merge agents without selected_agent_id' do
345
+ put :update, id: agent_merge_lists(:agent_merge_list_00001).id, mode: 'merge'
346
346
  flash[:notice].should eq I18n.t('merge_list.specify_id', model: I18n.t('activerecord.models.agent'))
347
347
  response.should redirect_to agent_merge_list_url(assigns(:agent_merge_list))
348
348
  end
349
349
 
350
- it "should merge agents with selected_agent_idand merge_mode" do
351
- put :update, :id => agent_merge_lists(:agent_merge_list_00001).id, :selected_agent_id => 3, :mode => 'merge'
350
+ it 'should merge agents with selected_agent_idand merge_mode' do
351
+ put :update, id: agent_merge_lists(:agent_merge_list_00001).id, selected_agent_id: 3, mode: 'merge'
352
352
  flash[:notice].should eq I18n.t('merge_list.successfully_merged', model: I18n.t('activerecord.models.agent'))
353
353
  response.should redirect_to agent_merge_list_url(assigns(:agent_merge_list))
354
354
  end
355
355
  end
356
356
 
357
- describe "When logged in as User" do
357
+ describe 'When logged in as User' do
358
358
  login_user
359
359
 
360
- describe "with valid params" do
361
- it "updates the requested agent_merge_list" do
362
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
360
+ describe 'with valid params' do
361
+ it 'updates the requested agent_merge_list' do
362
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
363
363
  end
364
364
 
365
- it "assigns the requested agent_merge_list as @agent_merge_list" do
366
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
365
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
366
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
367
367
  assigns(:agent_merge_list).should eq(@agent_merge_list)
368
368
  response.should be_forbidden
369
369
  end
370
370
  end
371
371
 
372
- describe "with invalid params" do
373
- it "assigns the requested agent_merge_list as @agent_merge_list" do
374
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
372
+ describe 'with invalid params' do
373
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
374
+ put :update, id: @agent_merge_list.id, agent_merge_list: @invalid_attrs
375
375
  response.should be_forbidden
376
376
  end
377
377
  end
378
378
  end
379
379
 
380
- describe "When not logged in" do
381
- describe "with valid params" do
382
- it "updates the requested agent_merge_list" do
383
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
380
+ describe 'When not logged in' do
381
+ describe 'with valid params' do
382
+ it 'updates the requested agent_merge_list' do
383
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
384
384
  end
385
385
 
386
- it "should be forbidden" do
387
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
386
+ it 'should be forbidden' do
387
+ put :update, id: @agent_merge_list.id, agent_merge_list: @attrs
388
388
  response.should redirect_to(new_user_session_url)
389
389
  end
390
390
  end
391
391
 
392
- describe "with invalid params" do
393
- it "assigns the requested agent_merge_list as @agent_merge_list" do
394
- put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
392
+ describe 'with invalid params' do
393
+ it 'assigns the requested agent_merge_list as @agent_merge_list' do
394
+ put :update, id: @agent_merge_list.id, agent_merge_list: @invalid_attrs
395
395
  response.should redirect_to(new_user_session_url)
396
396
  end
397
397
  end
398
398
  end
399
399
  end
400
400
 
401
- describe "DELETE destroy" do
401
+ describe 'DELETE destroy' do
402
402
  before(:each) do
403
403
  @agent_merge_list = FactoryGirl.create(:agent_merge_list)
404
404
  end
405
405
 
406
- describe "When logged in as Administrator" do
406
+ describe 'When logged in as Administrator' do
407
407
  login_admin
408
408
 
409
- it "destroys the requested agent_merge_list" do
410
- delete :destroy, :id => @agent_merge_list.id
409
+ it 'destroys the requested agent_merge_list' do
410
+ delete :destroy, id: @agent_merge_list.id
411
411
  end
412
412
 
413
- it "redirects to the agent_merge_lists list" do
414
- delete :destroy, :id => @agent_merge_list.id
413
+ it 'redirects to the agent_merge_lists list' do
414
+ delete :destroy, id: @agent_merge_list.id
415
415
  response.should redirect_to(agent_merge_lists_url)
416
416
  end
417
417
  end
418
418
 
419
- describe "When logged in as Librarian" do
419
+ describe 'When logged in as Librarian' do
420
420
  login_librarian
421
421
 
422
- it "destroys the requested agent_merge_list" do
423
- delete :destroy, :id => @agent_merge_list.id
422
+ it 'destroys the requested agent_merge_list' do
423
+ delete :destroy, id: @agent_merge_list.id
424
424
  end
425
425
 
426
- it "redirects to the agent_merge_lists list" do
427
- delete :destroy, :id => @agent_merge_list.id
426
+ it 'redirects to the agent_merge_lists list' do
427
+ delete :destroy, id: @agent_merge_list.id
428
428
  response.should redirect_to(agent_merge_lists_url)
429
429
  end
430
430
  end
431
431
 
432
- describe "When logged in as User" do
432
+ describe 'When logged in as User' do
433
433
  login_user
434
434
 
435
- it "destroys the requested agent_merge_list" do
436
- delete :destroy, :id => @agent_merge_list.id
435
+ it 'destroys the requested agent_merge_list' do
436
+ delete :destroy, id: @agent_merge_list.id
437
437
  end
438
438
 
439
- it "should be forbidden" do
440
- delete :destroy, :id => @agent_merge_list.id
439
+ it 'should be forbidden' do
440
+ delete :destroy, id: @agent_merge_list.id
441
441
  response.should be_forbidden
442
442
  end
443
443
  end
444
444
 
445
- describe "When not logged in" do
446
- it "destroys the requested agent_merge_list" do
447
- delete :destroy, :id => @agent_merge_list.id
445
+ describe 'When not logged in' do
446
+ it 'destroys the requested agent_merge_list' do
447
+ delete :destroy, id: @agent_merge_list.id
448
448
  end
449
449
 
450
- it "should be forbidden" do
451
- delete :destroy, :id => @agent_merge_list.id
450
+ it 'should be forbidden' do
451
+ delete :destroy, id: @agent_merge_list.id
452
452
  response.should redirect_to(new_user_session_url)
453
453
  end
454
454
  end