enju_resource_merge 0.1.0.pre7 → 0.1.0.pre8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/patron_merge_lists_controller.rb +37 -37
- data/app/controllers/patron_merges_controller.rb +35 -35
- data/app/controllers/series_statement_merge_lists_controller.rb +0 -1
- data/app/models/agent_merge.rb +21 -0
- data/app/models/agent_merge_list.rb +29 -0
- data/app/models/enju_resource_merge/ability.rb +4 -4
- data/app/models/series_statement_merge_list.rb +0 -18
- data/app/views/{patron_merge_lists → agent_merge_lists}/_form.html.erb +1 -1
- data/app/views/{patron_merge_lists → agent_merge_lists}/edit.html.erb +3 -3
- data/app/views/agent_merge_lists/index.html.erb +33 -0
- data/app/views/{patron_merge_lists → agent_merge_lists}/new.html.erb +1 -1
- data/app/views/agent_merge_lists/show.html.erb +31 -0
- data/app/views/agent_merges/edit.html.erb +31 -0
- data/app/views/agent_merges/index.html.erb +32 -0
- data/app/views/agent_merges/new.html.erb +39 -0
- data/app/views/agent_merges/show.html.erb +25 -0
- data/config/routes.rb +7 -7
- data/db/migrate/133_create_agent_merges.rb +15 -0
- data/db/migrate/134_create_agent_merge_lists.rb +13 -0
- data/lib/enju_resource_merge/version.rb +1 -1
- data/lib/enju_resource_merge.rb +2 -2
- data/spec/controllers/agent_merge_lists_controller_spec.rb +456 -0
- data/spec/controllers/agent_merges_controller_spec.rb +437 -0
- data/spec/dummy/app/controllers/application_controller.rb +3 -68
- data/spec/dummy/app/models/ability.rb +4 -4
- data/spec/dummy/app/models/user.rb +5 -25
- data/spec/dummy/config/application.rb +1 -1
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb} +8 -8
- data/spec/dummy/db/migrate/012_create_owns.rb +2 -2
- data/spec/dummy/db/migrate/015_create_creates.rb +2 -2
- data/spec/dummy/db/migrate/047_create_produces.rb +2 -2
- data/spec/dummy/db/migrate/059_create_libraries.rb +28 -0
- data/spec/dummy/db/migrate/069_create_shelves.rb +15 -0
- data/spec/dummy/db/migrate/077_create_user_groups.rb +16 -0
- data/spec/dummy/db/migrate/080_create_library_groups.rb +18 -0
- data/spec/dummy/db/migrate/120_create_baskets.rb +12 -0
- data/spec/dummy/db/migrate/124_create_bookstores.rb +17 -0
- data/spec/dummy/db/migrate/125_create_donates.rb +2 -2
- data/spec/dummy/db/migrate/{20090812151902_create_patron_relationship_types.rb → 130_create_request_status_types.rb} +2 -2
- data/spec/dummy/db/migrate/131_create_request_types.rb +12 -0
- data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +2 -2
- data/spec/dummy/db/migrate/{20080905191442_create_patron_types.rb → 20080905191442_create_agent_types.rb} +2 -2
- data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +17 -0
- data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +14 -0
- data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +17 -0
- data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +22 -0
- data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +12 -0
- data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +2 -2
- data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +9 -0
- data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +9 -0
- data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +13 -0
- data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +11 -0
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +12 -0
- data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +9 -0
- data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +11 -0
- data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +11 -0
- data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -5
- data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +5 -0
- data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +12 -0
- data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +14 -0
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +5 -0
- data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +6 -0
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +26 -0
- data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +6 -0
- data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +7 -0
- data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +5 -0
- data/spec/dummy/db/schema.rb +352 -154
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/factories/{patron.rb → agent.rb} +2 -2
- data/spec/factories/agent_merge.rb +6 -0
- data/spec/factories/agent_merge_list.rb +5 -0
- data/spec/factories/library.rb +13 -0
- data/spec/factories/user.rb +34 -6
- data/spec/fixtures/{patron_merge_lists.yml → agent_merge_lists.yml} +4 -4
- data/spec/fixtures/agent_merges.yml +31 -0
- data/spec/fixtures/{patron_types.yml → agent_types.yml} +4 -4
- data/spec/fixtures/{patrons.yml → agents.yml} +46 -46
- data/spec/fixtures/libraries.yml +102 -0
- data/spec/fixtures/library_groups.yml +34 -0
- data/spec/fixtures/series_statements.yml +23 -22
- data/spec/fixtures/shelves.yml +47 -0
- data/spec/fixtures/user_groups.yml +45 -0
- data/spec/models/{patron_merge_list_spec.rb → agent_merge_list_spec.rb} +2 -2
- data/spec/models/agent_merge_spec.rb +19 -0
- data/spec/models/series_statement_merge_list_spec.rb +0 -5
- metadata +136 -72
- data/app/models/patron_merge.rb +0 -21
- data/app/models/patron_merge_list.rb +0 -29
- data/app/views/patron_merge_lists/index.html.erb +0 -33
- data/app/views/patron_merge_lists/show.html.erb +0 -31
- data/app/views/patron_merges/edit.html.erb +0 -31
- data/app/views/patron_merges/index.html.erb +0 -32
- data/app/views/patron_merges/new.html.erb +0 -39
- data/app/views/patron_merges/show.html.erb +0 -25
- data/db/migrate/133_create_patron_merges.rb +0 -15
- data/db/migrate/134_create_patron_merge_lists.rb +0 -13
- data/spec/controllers/patron_merge_lists_controller_spec.rb +0 -456
- data/spec/controllers/patron_merges_controller_spec.rb +0 -437
- data/spec/dummy/app/models/role.rb +0 -47
- data/spec/dummy/app/models/user_has_role.rb +0 -4
- data/spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb +0 -22
- data/spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb +0 -13
- data/spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb +0 -11
- data/spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb +0 -12
- data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb +0 -11
- data/spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb +0 -13
- data/spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb +0 -9
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb +0 -5
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb +0 -5
- data/spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb +0 -9
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb +0 -5
- data/spec/factories/patron_merge.rb +0 -6
- data/spec/factories/patron_merge_list.rb +0 -5
- data/spec/fixtures/patron_merges.yml +0 -31
- data/spec/models/patron_merge_spec.rb +0 -19
@@ -1,437 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe PatronMergesController do
|
4
|
-
fixtures :all
|
5
|
-
|
6
|
-
describe "GET index" do
|
7
|
-
before(:each) do
|
8
|
-
FactoryGirl.create(:patron_merge)
|
9
|
-
end
|
10
|
-
|
11
|
-
describe "When logged in as Administrator" do
|
12
|
-
login_admin
|
13
|
-
|
14
|
-
it "assigns all patron_merges as @patron_merges" do
|
15
|
-
get :index
|
16
|
-
assigns(:patron_merges).should eq(PatronMerge.all)
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
describe "When logged in as Librarian" do
|
21
|
-
login_librarian
|
22
|
-
|
23
|
-
it "assigns all patron_merges as @patron_merges" do
|
24
|
-
get :index
|
25
|
-
assigns(:patron_merges).should eq(PatronMerge.all)
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
describe "When logged in as User" do
|
30
|
-
login_user
|
31
|
-
|
32
|
-
it "should be forbidden" do
|
33
|
-
get :index
|
34
|
-
assigns(:patron_merges).should be_empty
|
35
|
-
response.should be_forbidden
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
describe "When not logged in" do
|
40
|
-
it "should be forbidden" do
|
41
|
-
get :index
|
42
|
-
assigns(:patron_merges).should be_empty
|
43
|
-
response.should redirect_to(new_user_session_url)
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
describe "GET show" do
|
49
|
-
describe "When logged in as Administrator" do
|
50
|
-
login_admin
|
51
|
-
|
52
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
53
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
54
|
-
get :show, :id => patron_merge.id
|
55
|
-
assigns(:patron_merge).should eq(patron_merge)
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
describe "When logged in as Librarian" do
|
60
|
-
login_librarian
|
61
|
-
|
62
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
63
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
64
|
-
get :show, :id => patron_merge.id
|
65
|
-
assigns(:patron_merge).should eq(patron_merge)
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
describe "When logged in as User" do
|
70
|
-
login_user
|
71
|
-
|
72
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
73
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
74
|
-
get :show, :id => patron_merge.id
|
75
|
-
assigns(:patron_merge).should eq(patron_merge)
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
describe "When not logged in" do
|
80
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
81
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
82
|
-
get :show, :id => patron_merge.id
|
83
|
-
assigns(:patron_merge).should eq(patron_merge)
|
84
|
-
end
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
describe "GET new" do
|
89
|
-
describe "When logged in as Administrator" do
|
90
|
-
login_admin
|
91
|
-
|
92
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
93
|
-
get :new
|
94
|
-
assigns(:patron_merge).should_not be_valid
|
95
|
-
response.should be_success
|
96
|
-
end
|
97
|
-
end
|
98
|
-
|
99
|
-
describe "When logged in as Librarian" do
|
100
|
-
login_librarian
|
101
|
-
|
102
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
103
|
-
get :new
|
104
|
-
assigns(:patron_merge).should_not be_valid
|
105
|
-
response.should be_success
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
describe "When logged in as User" do
|
110
|
-
login_user
|
111
|
-
|
112
|
-
it "should not assign the requested patron_merge as @patron_merge" do
|
113
|
-
get :new
|
114
|
-
assigns(:patron_merge).should_not be_valid
|
115
|
-
response.should be_forbidden
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
|
-
describe "When not logged in" do
|
120
|
-
it "should not assign the requested patron_merge as @patron_merge" do
|
121
|
-
get :new
|
122
|
-
assigns(:patron_merge).should_not be_valid
|
123
|
-
response.should redirect_to(new_user_session_url)
|
124
|
-
end
|
125
|
-
end
|
126
|
-
end
|
127
|
-
|
128
|
-
describe "GET edit" do
|
129
|
-
describe "When logged in as Administrator" do
|
130
|
-
login_admin
|
131
|
-
|
132
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
133
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
134
|
-
get :edit, :id => patron_merge.id
|
135
|
-
assigns(:patron_merge).should eq(patron_merge)
|
136
|
-
end
|
137
|
-
end
|
138
|
-
|
139
|
-
describe "When logged in as Librarian" do
|
140
|
-
login_librarian
|
141
|
-
|
142
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
143
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
144
|
-
get :edit, :id => patron_merge.id
|
145
|
-
assigns(:patron_merge).should eq(patron_merge)
|
146
|
-
end
|
147
|
-
end
|
148
|
-
|
149
|
-
describe "When logged in as User" do
|
150
|
-
login_user
|
151
|
-
|
152
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
153
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
154
|
-
get :edit, :id => patron_merge.id
|
155
|
-
response.should be_forbidden
|
156
|
-
end
|
157
|
-
end
|
158
|
-
|
159
|
-
describe "When not logged in" do
|
160
|
-
it "should not assign the requested patron_merge as @patron_merge" do
|
161
|
-
patron_merge = FactoryGirl.create(:patron_merge)
|
162
|
-
get :edit, :id => patron_merge.id
|
163
|
-
response.should redirect_to(new_user_session_url)
|
164
|
-
end
|
165
|
-
end
|
166
|
-
end
|
167
|
-
|
168
|
-
describe "POST create" do
|
169
|
-
before(:each) do
|
170
|
-
@attrs = FactoryGirl.attributes_for(:patron_merge)
|
171
|
-
@invalid_attrs = {:patron_merge_list_id => ''}
|
172
|
-
end
|
173
|
-
|
174
|
-
describe "When logged in as Administrator" do
|
175
|
-
login_admin
|
176
|
-
|
177
|
-
describe "with valid params" do
|
178
|
-
it "assigns a newly created patron_merge as @patron_merge" do
|
179
|
-
post :create, :patron_merge => @attrs
|
180
|
-
assigns(:patron_merge).should be_valid
|
181
|
-
end
|
182
|
-
|
183
|
-
it "redirects to the created patron" do
|
184
|
-
post :create, :patron_merge => @attrs
|
185
|
-
response.should redirect_to(assigns(:patron_merge))
|
186
|
-
end
|
187
|
-
end
|
188
|
-
|
189
|
-
describe "with invalid params" do
|
190
|
-
it "assigns a newly created but unsaved patron_merge as @patron_merge" do
|
191
|
-
post :create, :patron_merge => @invalid_attrs
|
192
|
-
assigns(:patron_merge).should_not be_valid
|
193
|
-
end
|
194
|
-
|
195
|
-
it "re-renders the 'new' template" do
|
196
|
-
post :create, :patron_merge => @invalid_attrs
|
197
|
-
response.should render_template("new")
|
198
|
-
end
|
199
|
-
end
|
200
|
-
end
|
201
|
-
|
202
|
-
describe "When logged in as Librarian" do
|
203
|
-
login_librarian
|
204
|
-
|
205
|
-
describe "with valid params" do
|
206
|
-
it "assigns a newly created patron_merge as @patron_merge" do
|
207
|
-
post :create, :patron_merge => @attrs
|
208
|
-
assigns(:patron_merge).should be_valid
|
209
|
-
end
|
210
|
-
|
211
|
-
it "redirects to the created patron" do
|
212
|
-
post :create, :patron_merge => @attrs
|
213
|
-
response.should redirect_to(assigns(:patron_merge))
|
214
|
-
end
|
215
|
-
end
|
216
|
-
|
217
|
-
describe "with invalid params" do
|
218
|
-
it "assigns a newly created but unsaved patron_merge as @patron_merge" do
|
219
|
-
post :create, :patron_merge => @invalid_attrs
|
220
|
-
assigns(:patron_merge).should_not be_valid
|
221
|
-
end
|
222
|
-
|
223
|
-
it "re-renders the 'new' template" do
|
224
|
-
post :create, :patron_merge => @invalid_attrs
|
225
|
-
response.should render_template("new")
|
226
|
-
end
|
227
|
-
end
|
228
|
-
end
|
229
|
-
|
230
|
-
describe "When logged in as User" do
|
231
|
-
login_user
|
232
|
-
|
233
|
-
describe "with valid params" do
|
234
|
-
it "assigns a newly created patron_merge as @patron_merge" do
|
235
|
-
post :create, :patron_merge => @attrs
|
236
|
-
assigns(:patron_merge).should be_valid
|
237
|
-
end
|
238
|
-
|
239
|
-
it "should be forbidden" do
|
240
|
-
post :create, :patron_merge => @attrs
|
241
|
-
response.should be_forbidden
|
242
|
-
end
|
243
|
-
end
|
244
|
-
|
245
|
-
describe "with invalid params" do
|
246
|
-
it "assigns a newly created but unsaved patron_merge as @patron_merge" do
|
247
|
-
post :create, :patron_merge => @invalid_attrs
|
248
|
-
assigns(:patron_merge).should_not be_valid
|
249
|
-
end
|
250
|
-
|
251
|
-
it "should be forbidden" do
|
252
|
-
post :create, :patron_merge => @invalid_attrs
|
253
|
-
response.should be_forbidden
|
254
|
-
end
|
255
|
-
end
|
256
|
-
end
|
257
|
-
|
258
|
-
describe "When not logged in" do
|
259
|
-
describe "with valid params" do
|
260
|
-
it "assigns a newly created patron_merge as @patron_merge" do
|
261
|
-
post :create, :patron_merge => @attrs
|
262
|
-
assigns(:patron_merge).should be_valid
|
263
|
-
end
|
264
|
-
|
265
|
-
it "should be forbidden" do
|
266
|
-
post :create, :patron_merge => @attrs
|
267
|
-
response.should redirect_to(new_user_session_url)
|
268
|
-
end
|
269
|
-
end
|
270
|
-
|
271
|
-
describe "with invalid params" do
|
272
|
-
it "assigns a newly created but unsaved patron_merge as @patron_merge" do
|
273
|
-
post :create, :patron_merge => @invalid_attrs
|
274
|
-
assigns(:patron_merge).should_not be_valid
|
275
|
-
end
|
276
|
-
|
277
|
-
it "should be forbidden" do
|
278
|
-
post :create, :patron_merge => @invalid_attrs
|
279
|
-
response.should redirect_to(new_user_session_url)
|
280
|
-
end
|
281
|
-
end
|
282
|
-
end
|
283
|
-
end
|
284
|
-
|
285
|
-
describe "PUT update" do
|
286
|
-
before(:each) do
|
287
|
-
@patron_merge = FactoryGirl.create(:patron_merge)
|
288
|
-
@attrs = FactoryGirl.attributes_for(:patron_merge)
|
289
|
-
@invalid_attrs = {:patron_merge_list_id => ''}
|
290
|
-
end
|
291
|
-
|
292
|
-
describe "When logged in as Administrator" do
|
293
|
-
login_admin
|
294
|
-
|
295
|
-
describe "with valid params" do
|
296
|
-
it "updates the requested patron_merge" do
|
297
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
298
|
-
end
|
299
|
-
|
300
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
301
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
302
|
-
assigns(:patron_merge).should eq(@patron_merge)
|
303
|
-
response.should redirect_to(@patron_merge)
|
304
|
-
end
|
305
|
-
end
|
306
|
-
|
307
|
-
describe "with invalid params" do
|
308
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
309
|
-
put :update, :id => @patron_merge.id, :patron_merge => @invalid_attrs
|
310
|
-
response.should render_template("edit")
|
311
|
-
end
|
312
|
-
end
|
313
|
-
end
|
314
|
-
|
315
|
-
describe "When logged in as Librarian" do
|
316
|
-
login_librarian
|
317
|
-
|
318
|
-
describe "with valid params" do
|
319
|
-
it "updates the requested patron_merge" do
|
320
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
321
|
-
end
|
322
|
-
|
323
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
324
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
325
|
-
assigns(:patron_merge).should eq(@patron_merge)
|
326
|
-
response.should redirect_to(@patron_merge)
|
327
|
-
end
|
328
|
-
end
|
329
|
-
|
330
|
-
describe "with invalid params" do
|
331
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
332
|
-
put :update, :id => @patron_merge.id, :patron_merge => @invalid_attrs
|
333
|
-
response.should render_template("edit")
|
334
|
-
end
|
335
|
-
end
|
336
|
-
end
|
337
|
-
|
338
|
-
describe "When logged in as User" do
|
339
|
-
login_user
|
340
|
-
|
341
|
-
describe "with valid params" do
|
342
|
-
it "updates the requested patron_merge" do
|
343
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
344
|
-
end
|
345
|
-
|
346
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
347
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
348
|
-
assigns(:patron_merge).should eq(@patron_merge)
|
349
|
-
response.should be_forbidden
|
350
|
-
end
|
351
|
-
end
|
352
|
-
|
353
|
-
describe "with invalid params" do
|
354
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
355
|
-
put :update, :id => @patron_merge.id, :patron_merge => @invalid_attrs
|
356
|
-
response.should be_forbidden
|
357
|
-
end
|
358
|
-
end
|
359
|
-
end
|
360
|
-
|
361
|
-
describe "When not logged in" do
|
362
|
-
describe "with valid params" do
|
363
|
-
it "updates the requested patron_merge" do
|
364
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
365
|
-
end
|
366
|
-
|
367
|
-
it "should be forbidden" do
|
368
|
-
put :update, :id => @patron_merge.id, :patron_merge => @attrs
|
369
|
-
response.should redirect_to(new_user_session_url)
|
370
|
-
end
|
371
|
-
end
|
372
|
-
|
373
|
-
describe "with invalid params" do
|
374
|
-
it "assigns the requested patron_merge as @patron_merge" do
|
375
|
-
put :update, :id => @patron_merge.id, :patron_merge => @invalid_attrs
|
376
|
-
response.should redirect_to(new_user_session_url)
|
377
|
-
end
|
378
|
-
end
|
379
|
-
end
|
380
|
-
end
|
381
|
-
|
382
|
-
describe "DELETE destroy" do
|
383
|
-
before(:each) do
|
384
|
-
@patron_merge = FactoryGirl.create(:patron_merge)
|
385
|
-
end
|
386
|
-
|
387
|
-
describe "When logged in as Administrator" do
|
388
|
-
login_admin
|
389
|
-
|
390
|
-
it "destroys the requested patron_merge" do
|
391
|
-
delete :destroy, :id => @patron_merge.id
|
392
|
-
end
|
393
|
-
|
394
|
-
it "redirects to the patron_merges list" do
|
395
|
-
delete :destroy, :id => @patron_merge.id
|
396
|
-
response.should redirect_to(patron_merges_url)
|
397
|
-
end
|
398
|
-
end
|
399
|
-
|
400
|
-
describe "When logged in as Librarian" do
|
401
|
-
login_librarian
|
402
|
-
|
403
|
-
it "destroys the requested patron_merge" do
|
404
|
-
delete :destroy, :id => @patron_merge.id
|
405
|
-
end
|
406
|
-
|
407
|
-
it "redirects to the patron_merges list" do
|
408
|
-
delete :destroy, :id => @patron_merge.id
|
409
|
-
response.should redirect_to(patron_merges_url)
|
410
|
-
end
|
411
|
-
end
|
412
|
-
|
413
|
-
describe "When logged in as User" do
|
414
|
-
login_user
|
415
|
-
|
416
|
-
it "destroys the requested patron_merge" do
|
417
|
-
delete :destroy, :id => @patron_merge.id
|
418
|
-
end
|
419
|
-
|
420
|
-
it "should be forbidden" do
|
421
|
-
delete :destroy, :id => @patron_merge.id
|
422
|
-
response.should be_forbidden
|
423
|
-
end
|
424
|
-
end
|
425
|
-
|
426
|
-
describe "When not logged in" do
|
427
|
-
it "destroys the requested patron_merge" do
|
428
|
-
delete :destroy, :id => @patron_merge.id
|
429
|
-
end
|
430
|
-
|
431
|
-
it "should be forbidden" do
|
432
|
-
delete :destroy, :id => @patron_merge.id
|
433
|
-
response.should redirect_to(new_user_session_url)
|
434
|
-
end
|
435
|
-
end
|
436
|
-
end
|
437
|
-
end
|
@@ -1,47 +0,0 @@
|
|
1
|
-
class Role < ActiveRecord::Base
|
2
|
-
attr_accessible :name, :display_name, :note
|
3
|
-
include MasterModel
|
4
|
-
default_scope :order => "roles.position"
|
5
|
-
has_many :user_has_roles
|
6
|
-
has_many :users, :through => :user_has_roles
|
7
|
-
after_save :clear_all_cache
|
8
|
-
after_destroy :clear_all_cache
|
9
|
-
|
10
|
-
extend FriendlyId
|
11
|
-
friendly_id :name
|
12
|
-
|
13
|
-
def localized_name
|
14
|
-
display_name.localize
|
15
|
-
end
|
16
|
-
|
17
|
-
def self.all_cache
|
18
|
-
if Rails.env == 'production'
|
19
|
-
Rails.cache.fetch('role_all'){Role.select(:name).all}
|
20
|
-
else
|
21
|
-
Role.select(:name)
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|
25
|
-
def clear_all_cache
|
26
|
-
Rails.cache.delete('role_all')
|
27
|
-
end
|
28
|
-
|
29
|
-
def self.default_role
|
30
|
-
Rails.cache.fetch('default_role'){Role.find('Guest')}
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
# == Schema Information
|
35
|
-
#
|
36
|
-
# Table name: roles
|
37
|
-
#
|
38
|
-
# id :integer not null, primary key
|
39
|
-
# name :string(255) not null
|
40
|
-
# display_name :string(255)
|
41
|
-
# note :text
|
42
|
-
# created_at :datetime
|
43
|
-
# updated_at :datetime
|
44
|
-
# score :integer default(0), not null
|
45
|
-
# position :integer
|
46
|
-
#
|
47
|
-
|
@@ -1,22 +0,0 @@
|
|
1
|
-
class CreatePatronImportFiles < ActiveRecord::Migration
|
2
|
-
def change
|
3
|
-
create_table :patron_import_files do |t|
|
4
|
-
t.integer :parent_id
|
5
|
-
t.string :content_type
|
6
|
-
t.integer :size
|
7
|
-
t.integer :user_id
|
8
|
-
t.text :note
|
9
|
-
t.datetime :imported_at
|
10
|
-
t.string :state
|
11
|
-
t.string :patron_import_file_name
|
12
|
-
t.string :patron_import_content_type
|
13
|
-
t.integer :patron_import_file_size
|
14
|
-
t.datetime :patron_import_updated_at
|
15
|
-
|
16
|
-
t.timestamps
|
17
|
-
end
|
18
|
-
add_index :patron_import_files, :parent_id
|
19
|
-
add_index :patron_import_files, :user_id
|
20
|
-
add_index :patron_import_files, :state
|
21
|
-
end
|
22
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
class CreatePatronRelationships < ActiveRecord::Migration
|
2
|
-
def change
|
3
|
-
create_table :patron_relationships do |t|
|
4
|
-
t.integer :parent_id
|
5
|
-
t.integer :child_id
|
6
|
-
t.integer :patron_relationship_type_id
|
7
|
-
|
8
|
-
t.timestamps
|
9
|
-
end
|
10
|
-
add_index :patron_relationships, :parent_id
|
11
|
-
add_index :patron_relationships, :child_id
|
12
|
-
end
|
13
|
-
end
|
@@ -1,11 +0,0 @@
|
|
1
|
-
class AddPositionToPatronRelationship < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
add_column :manifestation_relationships, :position, :integer
|
4
|
-
add_column :patron_relationships, :position, :integer
|
5
|
-
end
|
6
|
-
|
7
|
-
def self.down
|
8
|
-
remove_column :patron_relationships, :position
|
9
|
-
remove_column :manifestation_relationships, :position
|
10
|
-
end
|
11
|
-
end
|
@@ -1,11 +0,0 @@
|
|
1
|
-
class AddBirthDateAndDeathDateToPatron < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
add_column :patrons, :birth_date, :string
|
4
|
-
add_column :patrons, :death_date, :string
|
5
|
-
end
|
6
|
-
|
7
|
-
def self.down
|
8
|
-
remove_column :patrons, :death_date
|
9
|
-
remove_column :patrons, :birth_date
|
10
|
-
end
|
11
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
class RenameSeriesStatementManifestationIdToRootManifestationId < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
remove_index :series_statements, :series_statement_identifier
|
4
|
-
rename_column :series_statements, :manifestation_id, :root_manifestation_id
|
5
|
-
add_index :series_statements, :series_statement_identifier
|
6
|
-
end
|
7
|
-
|
8
|
-
def self.down
|
9
|
-
remove_index :series_statements, :series_statement_identifier
|
10
|
-
rename_column :series_statements, :root_manifestation_id, :manifestation_id
|
11
|
-
add_index :series_statements, :series_statement_identifier
|
12
|
-
end
|
13
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
---
|
2
|
-
patron_merge_00001:
|
3
|
-
updated_at: 2008-02-17 18:51:36.776009 +09:00
|
4
|
-
id: 1
|
5
|
-
patron_id: 1
|
6
|
-
patron_merge_list_id: 1
|
7
|
-
created_at: 2008-02-17 18:51:36.776009 +09:00
|
8
|
-
patron_merge_00002:
|
9
|
-
updated_at: 2008-02-17 19:14:03.461761 +09:00
|
10
|
-
id: 2
|
11
|
-
patron_id: 2
|
12
|
-
patron_merge_list_id: 1
|
13
|
-
created_at: 2008-02-17 19:10:36.282814 +09:00
|
14
|
-
patron_merge_00003:
|
15
|
-
updated_at: 2008-02-17 19:19:19.265557 +09:00
|
16
|
-
patron_id: 3
|
17
|
-
patron_merge_list_id: 1
|
18
|
-
id: 3
|
19
|
-
created_at: 2008-02-17 19:19:19.265557 +09:00
|
20
|
-
|
21
|
-
# == Schema Information
|
22
|
-
#
|
23
|
-
# Table name: patron_merges
|
24
|
-
#
|
25
|
-
# id :integer not null, primary key
|
26
|
-
# patron_id :integer not null
|
27
|
-
# patron_merge_list_id :integer not null
|
28
|
-
# created_at :datetime not null
|
29
|
-
# updated_at :datetime not null
|
30
|
-
#
|
31
|
-
|
@@ -1,19 +0,0 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
|
-
require 'spec_helper'
|
3
|
-
|
4
|
-
describe PatronMerge do
|
5
|
-
#pending "add some examples to (or delete) #{__FILE__}"
|
6
|
-
|
7
|
-
end
|
8
|
-
|
9
|
-
# == Schema Information
|
10
|
-
#
|
11
|
-
# Table name: patron_merges
|
12
|
-
#
|
13
|
-
# id :integer not null, primary key
|
14
|
-
# patron_id :integer not null
|
15
|
-
# patron_merge_list_id :integer not null
|
16
|
-
# created_at :datetime not null
|
17
|
-
# updated_at :datetime not null
|
18
|
-
#
|
19
|
-
|