enju_biblio 0.2.3 → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (126) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/picture_files_controller.rb +1 -1
  3. data/app/models/item.rb +1 -1
  4. data/app/models/manifestation.rb +22 -2
  5. data/app/models/resource_import_file.rb +4 -4
  6. data/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +5 -0
  7. data/lib/enju_biblio/version.rb +1 -1
  8. data/spec/cassette_library/ImportRequest/import/should_import_bibliographic_record.yml +38 -655
  9. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/should_import_without_errors.yml +43 -191
  10. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_isbn_which_is_already_imported/redirects_to_the_created_import_request.yml +40 -592
  11. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +37 -589
  12. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/redirects_to_the_created_import_request.yml +41 -593
  13. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +39 -591
  14. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/redirects_to_the_created_import_request.yml +39 -591
  15. data/spec/cassette_library/ResourceImportFile/should_import_in_background.yml +40 -425
  16. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/ISBN_import/with_record_not_found/should_record_an_error_message.yml +39 -75
  17. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_has_only_isbn/should_be_imported.yml +39 -705
  18. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_shift_jis/should_be_imported.yml +39 -424
  19. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_be_imported.yml +37 -422
  20. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_be_searchable_right_after_the_import.yml +41 -426
  21. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_send_message_when_import_is_completed.yml +39 -424
  22. data/spec/controllers/agent_merge_lists_controller_spec.rb +9 -9
  23. data/spec/controllers/agent_merges_controller_spec.rb +13 -13
  24. data/spec/controllers/agent_relationship_types_controller_spec.rb +12 -12
  25. data/spec/controllers/agent_relationships_controller_spec.rb +12 -12
  26. data/spec/controllers/agent_types_controller_spec.rb +1 -1
  27. data/spec/controllers/agents_controller_spec.rb +6 -6
  28. data/spec/controllers/carrier_types_controller_spec.rb +1 -1
  29. data/spec/controllers/content_types_controller_spec.rb +3 -3
  30. data/spec/controllers/countries_controller_spec.rb +9 -9
  31. data/spec/controllers/create_types_controller_spec.rb +1 -1
  32. data/spec/controllers/creates_controller_spec.rb +11 -11
  33. data/spec/controllers/donates_controller_spec.rb +11 -11
  34. data/spec/controllers/form_of_works_controller_spec.rb +1 -1
  35. data/spec/controllers/frequencies_controller_spec.rb +3 -3
  36. data/spec/controllers/identifier_types_controller_spec.rb +1 -1
  37. data/spec/controllers/import_requests_controller_spec.rb +5 -5
  38. data/spec/controllers/items_controller_spec.rb +15 -15
  39. data/spec/controllers/languages_controller_spec.rb +6 -6
  40. data/spec/controllers/licenses_controller_spec.rb +1 -1
  41. data/spec/controllers/manifestation_relationship_types_controller_spec.rb +12 -12
  42. data/spec/controllers/manifestation_relationships_controller_spec.rb +12 -12
  43. data/spec/controllers/manifestations_controller_spec.rb +29 -29
  44. data/spec/controllers/medium_of_performances_controller_spec.rb +1 -1
  45. data/spec/controllers/owns_controller_spec.rb +12 -12
  46. data/spec/controllers/produce_types_controller_spec.rb +1 -1
  47. data/spec/controllers/produces_controller_spec.rb +10 -10
  48. data/spec/controllers/realize_types_controller_spec.rb +1 -1
  49. data/spec/controllers/realizes_controller_spec.rb +11 -11
  50. data/spec/controllers/series_statement_merge_lists_controller_spec.rb +12 -12
  51. data/spec/controllers/series_statement_merges_controller_spec.rb +12 -12
  52. data/spec/controllers/series_statements_controller_spec.rb +11 -11
  53. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +5 -0
  54. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +5 -0
  55. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +5 -0
  56. data/spec/dummy/db/schema.rb +7 -3
  57. data/spec/factories/agent.rb +2 -2
  58. data/spec/factories/agent_merge.rb +3 -3
  59. data/spec/factories/agent_merge_list.rb +1 -1
  60. data/spec/factories/basket.rb +2 -2
  61. data/spec/factories/carrier_type.rb +1 -1
  62. data/spec/factories/checkout.rb +1 -1
  63. data/spec/factories/classification.rb +2 -2
  64. data/spec/factories/classification_type.rb +1 -1
  65. data/spec/factories/content_type.rb +1 -1
  66. data/spec/factories/country.rb +1 -1
  67. data/spec/factories/create.rb +3 -3
  68. data/spec/factories/create_types.rb +1 -1
  69. data/spec/factories/donate.rb +3 -3
  70. data/spec/factories/form_of_work.rb +1 -1
  71. data/spec/factories/frequency.rb +1 -1
  72. data/spec/factories/identifier.rb +2 -2
  73. data/spec/factories/identifier_type.rb +1 -1
  74. data/spec/factories/import_request.rb +1 -1
  75. data/spec/factories/item.rb +2 -2
  76. data/spec/factories/language.rb +1 -1
  77. data/spec/factories/library.rb +2 -2
  78. data/spec/factories/license.rb +1 -1
  79. data/spec/factories/manifestation.rb +2 -2
  80. data/spec/factories/manifestation_relationship.rb +3 -3
  81. data/spec/factories/manifestation_relationship_type.rb +1 -1
  82. data/spec/factories/medium_of_performance.rb +1 -1
  83. data/spec/factories/own.rb +3 -3
  84. data/spec/factories/patron_relationship.rb +3 -3
  85. data/spec/factories/patron_relationship_type.rb +1 -1
  86. data/spec/factories/patron_type.rb +1 -1
  87. data/spec/factories/produce.rb +3 -3
  88. data/spec/factories/produce_types.rb +1 -1
  89. data/spec/factories/profile.rb +2 -2
  90. data/spec/factories/realize.rb +3 -3
  91. data/spec/factories/realize_types.rb +1 -1
  92. data/spec/factories/reserve.rb +5 -5
  93. data/spec/factories/role.rb +1 -1
  94. data/spec/factories/series_has_manifestation.rb +3 -3
  95. data/spec/factories/series_statement.rb +2 -2
  96. data/spec/factories/series_statement_merge.rb +3 -3
  97. data/spec/factories/series_statement_merge_list.rb +1 -1
  98. data/spec/factories/series_statement_relationship.rb +3 -3
  99. data/spec/factories/shelf.rb +2 -2
  100. data/spec/factories/subject.rb +3 -3
  101. data/spec/factories/subject_heading_type.rb +1 -1
  102. data/spec/factories/subject_heading_type_has_subject.rb +3 -3
  103. data/spec/factories/subject_type.rb +1 -1
  104. data/spec/factories/user.rb +1 -1
  105. data/spec/fixtures/items.yml +1 -1
  106. data/spec/fixtures/library_groups.yml +1 -1
  107. data/spec/models/agent_spec.rb +4 -4
  108. data/spec/models/create_type_spec.rb +1 -1
  109. data/spec/models/item_spec.rb +1 -1
  110. data/spec/models/manifestation_spec.rb +30 -6
  111. data/spec/models/produce_type_spec.rb +1 -1
  112. data/spec/models/realize_type_spec.rb +1 -1
  113. data/spec/models/resource_export_file_spec.rb +7 -7
  114. data/spec/models/resource_import_file_spec.rb +19 -0
  115. data/spec/models/series_statement_spec.rb +1 -1
  116. data/spec/policies/manifestation_policy_spec.rb +5 -5
  117. data/spec/rails_helper.rb +3 -3
  118. data/spec/support/controller_macros.rb +3 -3
  119. data/spec/views/items/index.html.erb_spec.rb +2 -2
  120. data/spec/views/manifestations/index.html.erb_spec.rb +1 -1
  121. data/spec/views/manifestations/index.rdf.builder_spec.rb +1 -1
  122. data/spec/views/manifestations/index.txt.erb_spec.rb +2 -2
  123. data/spec/views/manifestations/show.html.erb_spec.rb +5 -5
  124. data/spec/views/manifestations/show.txt.erb_spec.rb +1 -1
  125. data/spec/views/series_statement_merges/show.html.erb_spec.rb +1 -1
  126. metadata +23 -16
@@ -6,12 +6,12 @@ describe OwnsController do
6
6
  disconnect_sunspot
7
7
 
8
8
  def valid_attributes
9
- FactoryGirl.attributes_for(:own)
9
+ FactoryBot.attributes_for(:own)
10
10
  end
11
11
 
12
12
  describe 'GET index' do
13
13
  before(:each) do
14
- FactoryGirl.create(:own)
14
+ FactoryBot.create(:own)
15
15
  end
16
16
 
17
17
  describe 'When logged in as Administrator' do
@@ -54,7 +54,7 @@ describe OwnsController do
54
54
  login_fixture_admin
55
55
 
56
56
  it 'assigns the requested own as @own' do
57
- own = FactoryGirl.create(:own)
57
+ own = FactoryBot.create(:own)
58
58
  get :show, id: own.id
59
59
  expect(assigns(:own)).to eq(own)
60
60
  end
@@ -64,7 +64,7 @@ describe OwnsController do
64
64
  login_fixture_librarian
65
65
 
66
66
  it 'assigns the requested own as @own' do
67
- own = FactoryGirl.create(:own)
67
+ own = FactoryBot.create(:own)
68
68
  get :show, id: own.id
69
69
  expect(assigns(:own)).to eq(own)
70
70
  end
@@ -74,7 +74,7 @@ describe OwnsController do
74
74
  login_fixture_user
75
75
 
76
76
  it 'assigns the requested own as @own' do
77
- own = FactoryGirl.create(:own)
77
+ own = FactoryBot.create(:own)
78
78
  get :show, id: own.id
79
79
  expect(assigns(:own)).to eq(own)
80
80
  end
@@ -82,7 +82,7 @@ describe OwnsController do
82
82
 
83
83
  describe 'When not logged in' do
84
84
  it 'assigns the requested own as @own' do
85
- own = FactoryGirl.create(:own)
85
+ own = FactoryBot.create(:own)
86
86
  get :show, id: own.id
87
87
  expect(assigns(:own)).to eq(own)
88
88
  end
@@ -134,7 +134,7 @@ describe OwnsController do
134
134
  login_fixture_admin
135
135
 
136
136
  it 'assigns the requested own as @own' do
137
- own = FactoryGirl.create(:own)
137
+ own = FactoryBot.create(:own)
138
138
  get :edit, id: own.id
139
139
  expect(assigns(:own)).to eq(own)
140
140
  end
@@ -144,7 +144,7 @@ describe OwnsController do
144
144
  login_fixture_librarian
145
145
 
146
146
  it 'assigns the requested own as @own' do
147
- own = FactoryGirl.create(:own)
147
+ own = FactoryBot.create(:own)
148
148
  get :edit, id: own.id
149
149
  expect(assigns(:own)).to eq(own)
150
150
  end
@@ -154,7 +154,7 @@ describe OwnsController do
154
154
  login_fixture_user
155
155
 
156
156
  it 'assigns the requested own as @own' do
157
- own = FactoryGirl.create(:own)
157
+ own = FactoryBot.create(:own)
158
158
  get :edit, id: own.id
159
159
  expect(response).to be_forbidden
160
160
  end
@@ -162,7 +162,7 @@ describe OwnsController do
162
162
 
163
163
  describe 'When not logged in' do
164
164
  it 'should not assign the requested own as @own' do
165
- own = FactoryGirl.create(:own)
165
+ own = FactoryBot.create(:own)
166
166
  get :edit, id: own.id
167
167
  expect(response).to redirect_to(new_user_session_url)
168
168
  end
@@ -288,7 +288,7 @@ describe OwnsController do
288
288
 
289
289
  describe 'PUT update' do
290
290
  before(:each) do
291
- @own = FactoryGirl.create(:own)
291
+ @own = FactoryBot.create(:own)
292
292
  @attrs = valid_attributes
293
293
  @invalid_attrs = { item_id: '' }
294
294
  end
@@ -390,7 +390,7 @@ describe OwnsController do
390
390
 
391
391
  describe 'DELETE destroy' do
392
392
  before(:each) do
393
- @own = FactoryGirl.create(:own)
393
+ @own = FactoryBot.create(:own)
394
394
  end
395
395
 
396
396
  describe 'When logged in as Administrator' do
@@ -26,7 +26,7 @@ describe ProduceTypesController do
26
26
  # ProduceType. As you add validations to ProduceType, be sure to
27
27
  # update the return value of this method accordingly.
28
28
  def valid_attributes
29
- FactoryGirl.attributes_for(:produce_type)
29
+ FactoryBot.attributes_for(:produce_type)
30
30
  end
31
31
 
32
32
  describe 'GET index' do
@@ -6,7 +6,7 @@ describe ProducesController do
6
6
  disconnect_sunspot
7
7
 
8
8
  def valid_attributes
9
- FactoryGirl.attributes_for(:produce)
9
+ FactoryBot.attributes_for(:produce)
10
10
  end
11
11
 
12
12
  describe 'GET index' do
@@ -50,7 +50,7 @@ describe ProducesController do
50
50
  login_fixture_admin
51
51
 
52
52
  it 'assigns the requested produce as @produce' do
53
- produce = FactoryGirl.create(:produce)
53
+ produce = FactoryBot.create(:produce)
54
54
  get :show, id: produce.id
55
55
  expect(assigns(:produce)).to eq(produce)
56
56
  end
@@ -60,7 +60,7 @@ describe ProducesController do
60
60
  login_fixture_librarian
61
61
 
62
62
  it 'assigns the requested produce as @produce' do
63
- produce = FactoryGirl.create(:produce)
63
+ produce = FactoryBot.create(:produce)
64
64
  get :show, id: produce.id
65
65
  expect(assigns(:produce)).to eq(produce)
66
66
  end
@@ -70,7 +70,7 @@ describe ProducesController do
70
70
  login_fixture_user
71
71
 
72
72
  it 'assigns the requested produce as @produce' do
73
- produce = FactoryGirl.create(:produce)
73
+ produce = FactoryBot.create(:produce)
74
74
  get :show, id: produce.id
75
75
  expect(assigns(:produce)).to eq(produce)
76
76
  end
@@ -78,7 +78,7 @@ describe ProducesController do
78
78
 
79
79
  describe 'When not logged in' do
80
80
  it 'assigns the requested produce as @produce' do
81
- produce = FactoryGirl.create(:produce)
81
+ produce = FactoryBot.create(:produce)
82
82
  get :show, id: produce.id
83
83
  expect(assigns(:produce)).to eq(produce)
84
84
  end
@@ -128,7 +128,7 @@ describe ProducesController do
128
128
  login_fixture_admin
129
129
 
130
130
  it 'assigns the requested produce as @produce' do
131
- produce = FactoryGirl.create(:produce)
131
+ produce = FactoryBot.create(:produce)
132
132
  get :edit, id: produce.id
133
133
  expect(assigns(:produce)).to eq(produce)
134
134
  end
@@ -138,7 +138,7 @@ describe ProducesController do
138
138
  login_fixture_librarian
139
139
 
140
140
  it 'assigns the requested produce as @produce' do
141
- produce = FactoryGirl.create(:produce)
141
+ produce = FactoryBot.create(:produce)
142
142
  get :edit, id: produce.id
143
143
  expect(assigns(:produce)).to eq(produce)
144
144
  end
@@ -148,7 +148,7 @@ describe ProducesController do
148
148
  login_fixture_user
149
149
 
150
150
  it 'assigns the requested produce as @produce' do
151
- produce = FactoryGirl.create(:produce)
151
+ produce = FactoryBot.create(:produce)
152
152
  get :edit, id: produce.id
153
153
  expect(response).to be_forbidden
154
154
  end
@@ -156,7 +156,7 @@ describe ProducesController do
156
156
 
157
157
  describe 'When not logged in' do
158
158
  it 'should not assign the requested produce as @produce' do
159
- produce = FactoryGirl.create(:produce)
159
+ produce = FactoryBot.create(:produce)
160
160
  get :edit, id: produce.id
161
161
  expect(response).to redirect_to(new_user_session_url)
162
162
  end
@@ -390,7 +390,7 @@ describe ProducesController do
390
390
 
391
391
  describe 'DELETE destroy' do
392
392
  before(:each) do
393
- @produce = FactoryGirl.create(:produce)
393
+ @produce = FactoryBot.create(:produce)
394
394
  end
395
395
 
396
396
  describe 'When logged in as Administrator' do
@@ -26,7 +26,7 @@ describe RealizeTypesController do
26
26
  # RealizeType. As you add validations to RealizeType, be sure to
27
27
  # update the return value of this method accordingly.
28
28
  def valid_attributes
29
- FactoryGirl.attributes_for(:realize_type)
29
+ FactoryBot.attributes_for(:realize_type)
30
30
  end
31
31
 
32
32
  describe 'GET index' do
@@ -46,7 +46,7 @@ describe RealizesController do
46
46
  login_fixture_admin
47
47
 
48
48
  it 'assigns the requested realize as @realize' do
49
- realize = FactoryGirl.create(:realize)
49
+ realize = FactoryBot.create(:realize)
50
50
  get :show, id: realize.id
51
51
  expect(assigns(:realize)).to eq(realize)
52
52
  end
@@ -56,7 +56,7 @@ describe RealizesController do
56
56
  login_fixture_librarian
57
57
 
58
58
  it 'assigns the requested realize as @realize' do
59
- realize = FactoryGirl.create(:realize)
59
+ realize = FactoryBot.create(:realize)
60
60
  get :show, id: realize.id
61
61
  expect(assigns(:realize)).to eq(realize)
62
62
  end
@@ -66,7 +66,7 @@ describe RealizesController do
66
66
  login_fixture_user
67
67
 
68
68
  it 'assigns the requested realize as @realize' do
69
- realize = FactoryGirl.create(:realize)
69
+ realize = FactoryBot.create(:realize)
70
70
  get :show, id: realize.id
71
71
  expect(assigns(:realize)).to eq(realize)
72
72
  end
@@ -74,7 +74,7 @@ describe RealizesController do
74
74
 
75
75
  describe 'When not logged in' do
76
76
  it 'assigns the requested realize as @realize' do
77
- realize = FactoryGirl.create(:realize)
77
+ realize = FactoryBot.create(:realize)
78
78
  get :show, id: realize.id
79
79
  expect(assigns(:realize)).to eq(realize)
80
80
  end
@@ -124,7 +124,7 @@ describe RealizesController do
124
124
  login_fixture_admin
125
125
 
126
126
  it 'assigns the requested realize as @realize' do
127
- realize = FactoryGirl.create(:realize)
127
+ realize = FactoryBot.create(:realize)
128
128
  get :edit, id: realize.id
129
129
  expect(assigns(:realize)).to eq(realize)
130
130
  end
@@ -134,7 +134,7 @@ describe RealizesController do
134
134
  login_fixture_librarian
135
135
 
136
136
  it 'assigns the requested realize as @realize' do
137
- realize = FactoryGirl.create(:realize)
137
+ realize = FactoryBot.create(:realize)
138
138
  get :edit, id: realize.id
139
139
  expect(assigns(:realize)).to eq(realize)
140
140
  end
@@ -144,7 +144,7 @@ describe RealizesController do
144
144
  login_fixture_user
145
145
 
146
146
  it 'assigns the requested realize as @realize' do
147
- realize = FactoryGirl.create(:realize)
147
+ realize = FactoryBot.create(:realize)
148
148
  get :edit, id: realize.id
149
149
  expect(response).to be_forbidden
150
150
  end
@@ -152,7 +152,7 @@ describe RealizesController do
152
152
 
153
153
  describe 'When not logged in' do
154
154
  it 'should not assign the requested realize as @realize' do
155
- realize = FactoryGirl.create(:realize)
155
+ realize = FactoryBot.create(:realize)
156
156
  get :edit, id: realize.id
157
157
  expect(response).to redirect_to(new_user_session_url)
158
158
  end
@@ -161,7 +161,7 @@ describe RealizesController do
161
161
 
162
162
  describe 'POST create' do
163
163
  before(:each) do
164
- @attrs = FactoryGirl.attributes_for(:realize)
164
+ @attrs = FactoryBot.attributes_for(:realize)
165
165
  @invalid_attrs = { expression_id: '' }
166
166
  end
167
167
 
@@ -279,7 +279,7 @@ describe RealizesController do
279
279
  describe 'PUT update' do
280
280
  before(:each) do
281
281
  @realize = realizes(:realize_00001)
282
- @attrs = FactoryGirl.attributes_for(:realize)
282
+ @attrs = FactoryBot.attributes_for(:realize)
283
283
  @invalid_attrs = { expression_id: '' }
284
284
  end
285
285
 
@@ -391,7 +391,7 @@ describe RealizesController do
391
391
 
392
392
  describe 'DELETE destroy' do
393
393
  before(:each) do
394
- @realize = FactoryGirl.create(:realize)
394
+ @realize = FactoryBot.create(:realize)
395
395
  end
396
396
 
397
397
  describe 'When logged in as Administrator' do
@@ -45,7 +45,7 @@ describe SeriesStatementMergeListsController do
45
45
  login_admin
46
46
 
47
47
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
48
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
48
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
49
49
  get :show, id: series_statement_merge_list.id
50
50
  assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
51
51
  end
@@ -55,7 +55,7 @@ describe SeriesStatementMergeListsController do
55
55
  login_librarian
56
56
 
57
57
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
58
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
58
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
59
59
  get :show, id: series_statement_merge_list.id
60
60
  assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
61
61
  end
@@ -65,7 +65,7 @@ describe SeriesStatementMergeListsController do
65
65
  login_user
66
66
 
67
67
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
68
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
68
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
69
69
  get :show, id: series_statement_merge_list.id
70
70
  assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
71
71
  end
@@ -73,7 +73,7 @@ describe SeriesStatementMergeListsController do
73
73
 
74
74
  describe 'When not logged in' do
75
75
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
76
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
76
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
77
77
  get :show, id: series_statement_merge_list.id
78
78
  assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
79
79
  end
@@ -123,7 +123,7 @@ describe SeriesStatementMergeListsController do
123
123
  login_admin
124
124
 
125
125
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
126
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
126
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
127
127
  get :edit, id: series_statement_merge_list.id
128
128
  assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
129
129
  end
@@ -133,7 +133,7 @@ describe SeriesStatementMergeListsController do
133
133
  login_librarian
134
134
 
135
135
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
136
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
136
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
137
137
  get :edit, id: series_statement_merge_list.id
138
138
  assigns(:series_statement_merge_list).should eq(series_statement_merge_list)
139
139
  end
@@ -143,7 +143,7 @@ describe SeriesStatementMergeListsController do
143
143
  login_user
144
144
 
145
145
  it 'assigns the requested series_statement_merge_list as @series_statement_merge_list' do
146
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
146
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
147
147
  get :edit, id: series_statement_merge_list.id
148
148
  response.should be_forbidden
149
149
  end
@@ -151,7 +151,7 @@ describe SeriesStatementMergeListsController do
151
151
 
152
152
  describe 'When not logged in' do
153
153
  it 'should not assign the requested series_statement_merge_list as @series_statement_merge_list' do
154
- series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
154
+ series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
155
155
  get :edit, id: series_statement_merge_list.id
156
156
  response.should redirect_to(new_user_session_url)
157
157
  end
@@ -160,7 +160,7 @@ describe SeriesStatementMergeListsController do
160
160
 
161
161
  describe 'POST create' do
162
162
  before(:each) do
163
- @attrs = FactoryGirl.attributes_for(:series_statement_merge_list)
163
+ @attrs = FactoryBot.attributes_for(:series_statement_merge_list)
164
164
  @invalid_attrs = { title: '' }
165
165
  end
166
166
 
@@ -277,8 +277,8 @@ describe SeriesStatementMergeListsController do
277
277
 
278
278
  describe 'PUT update' do
279
279
  before(:each) do
280
- @series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
281
- @attrs = FactoryGirl.attributes_for(:series_statement_merge_list)
280
+ @series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
281
+ @attrs = FactoryBot.attributes_for(:series_statement_merge_list)
282
282
  @invalid_attrs = { title: '' }
283
283
  end
284
284
 
@@ -383,7 +383,7 @@ describe SeriesStatementMergeListsController do
383
383
 
384
384
  describe 'DELETE destroy' do
385
385
  before(:each) do
386
- @series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
386
+ @series_statement_merge_list = FactoryBot.create(:series_statement_merge_list)
387
387
  end
388
388
 
389
389
  describe 'When logged in as Administrator' do
@@ -46,7 +46,7 @@ describe SeriesStatementMergesController do
46
46
  login_admin
47
47
 
48
48
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
49
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
49
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
50
50
  get :show, id: series_statement_merge.id
51
51
  assigns(:series_statement_merge).should eq(series_statement_merge)
52
52
  end
@@ -56,7 +56,7 @@ describe SeriesStatementMergesController do
56
56
  login_librarian
57
57
 
58
58
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
59
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
59
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
60
60
  get :show, id: series_statement_merge.id
61
61
  assigns(:series_statement_merge).should eq(series_statement_merge)
62
62
  end
@@ -66,7 +66,7 @@ describe SeriesStatementMergesController do
66
66
  login_user
67
67
 
68
68
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
69
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
69
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
70
70
  get :show, id: series_statement_merge.id
71
71
  assigns(:series_statement_merge).should eq(series_statement_merge)
72
72
  end
@@ -74,7 +74,7 @@ describe SeriesStatementMergesController do
74
74
 
75
75
  describe 'When not logged in' do
76
76
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
77
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
77
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
78
78
  get :show, id: series_statement_merge.id
79
79
  assigns(:series_statement_merge).should eq(series_statement_merge)
80
80
  end
@@ -126,7 +126,7 @@ describe SeriesStatementMergesController do
126
126
  login_admin
127
127
 
128
128
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
129
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
129
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
130
130
  get :edit, id: series_statement_merge.id
131
131
  assigns(:series_statement_merge).should eq(series_statement_merge)
132
132
  end
@@ -136,7 +136,7 @@ describe SeriesStatementMergesController do
136
136
  login_librarian
137
137
 
138
138
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
139
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
139
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
140
140
  get :edit, id: series_statement_merge.id
141
141
  assigns(:series_statement_merge).should eq(series_statement_merge)
142
142
  end
@@ -146,7 +146,7 @@ describe SeriesStatementMergesController do
146
146
  login_user
147
147
 
148
148
  it 'assigns the requested series_statement_merge as @series_statement_merge' do
149
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
149
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
150
150
  get :edit, id: series_statement_merge.id
151
151
  response.should be_forbidden
152
152
  end
@@ -154,7 +154,7 @@ describe SeriesStatementMergesController do
154
154
 
155
155
  describe 'When not logged in' do
156
156
  it 'should not assign the requested series_statement_merge as @series_statement_merge' do
157
- series_statement_merge = FactoryGirl.create(:series_statement_merge)
157
+ series_statement_merge = FactoryBot.create(:series_statement_merge)
158
158
  get :edit, id: series_statement_merge.id
159
159
  response.should redirect_to(new_user_session_url)
160
160
  end
@@ -163,7 +163,7 @@ describe SeriesStatementMergesController do
163
163
 
164
164
  describe 'POST create' do
165
165
  before(:each) do
166
- @attrs = FactoryGirl.attributes_for(:series_statement_merge)
166
+ @attrs = FactoryBot.attributes_for(:series_statement_merge)
167
167
  @invalid_attrs = { series_statement_merge_list_id: '' }
168
168
  end
169
169
 
@@ -280,8 +280,8 @@ describe SeriesStatementMergesController do
280
280
 
281
281
  describe 'PUT update' do
282
282
  before(:each) do
283
- @series_statement_merge = FactoryGirl.create(:series_statement_merge)
284
- @attrs = FactoryGirl.attributes_for(:series_statement_merge)
283
+ @series_statement_merge = FactoryBot.create(:series_statement_merge)
284
+ @attrs = FactoryBot.attributes_for(:series_statement_merge)
285
285
  @invalid_attrs = { series_statement_merge_list_id: '' }
286
286
  end
287
287
 
@@ -377,7 +377,7 @@ describe SeriesStatementMergesController do
377
377
 
378
378
  describe 'DELETE destroy' do
379
379
  before(:each) do
380
- @series_statement_merge = FactoryGirl.create(:series_statement_merge)
380
+ @series_statement_merge = FactoryBot.create(:series_statement_merge)
381
381
  end
382
382
 
383
383
  describe 'When logged in as Administrator' do
@@ -4,7 +4,7 @@ describe SeriesStatementsController do
4
4
  fixtures :users
5
5
 
6
6
  def valid_attributes
7
- FactoryGirl.attributes_for(:series_statement)
7
+ FactoryBot.attributes_for(:series_statement)
8
8
  end
9
9
 
10
10
  describe 'GET index', solr: true do
@@ -52,7 +52,7 @@ describe SeriesStatementsController do
52
52
  login_fixture_admin
53
53
 
54
54
  it 'assigns the requested series_statement as @series_statement' do
55
- series_statement = FactoryGirl.create(:series_statement)
55
+ series_statement = FactoryBot.create(:series_statement)
56
56
  get :show, id: series_statement.id
57
57
  expect(assigns(:series_statement)).to eq(series_statement)
58
58
  expect(response).to be_success
@@ -63,7 +63,7 @@ describe SeriesStatementsController do
63
63
  login_fixture_librarian
64
64
 
65
65
  it 'assigns the requested series_statement as @series_statement' do
66
- series_statement = FactoryGirl.create(:series_statement)
66
+ series_statement = FactoryBot.create(:series_statement)
67
67
  get :show, id: series_statement.id
68
68
  expect(assigns(:series_statement)).to eq(series_statement)
69
69
  expect(response).to be_success
@@ -74,7 +74,7 @@ describe SeriesStatementsController do
74
74
  login_fixture_user
75
75
 
76
76
  it 'assigns the requested series_statement as @series_statement' do
77
- series_statement = FactoryGirl.create(:series_statement)
77
+ series_statement = FactoryBot.create(:series_statement)
78
78
  get :show, id: series_statement.id
79
79
  expect(assigns(:series_statement)).to eq(series_statement)
80
80
  expect(response).to be_success
@@ -83,7 +83,7 @@ describe SeriesStatementsController do
83
83
 
84
84
  describe 'When not logged in' do
85
85
  it 'assigns the requested series_statement as @series_statement' do
86
- series_statement = FactoryGirl.create(:series_statement)
86
+ series_statement = FactoryBot.create(:series_statement)
87
87
  get :show, id: series_statement.id
88
88
  expect(assigns(:series_statement)).to eq(series_statement)
89
89
  expect(response).to be_success
@@ -134,7 +134,7 @@ describe SeriesStatementsController do
134
134
  login_fixture_admin
135
135
 
136
136
  it 'assigns the requested series_statement as @series_statement' do
137
- series_statement = FactoryGirl.create(:series_statement)
137
+ series_statement = FactoryBot.create(:series_statement)
138
138
  get :edit, id: series_statement.id
139
139
  expect(assigns(:series_statement)).to eq(series_statement)
140
140
  end
@@ -144,7 +144,7 @@ describe SeriesStatementsController do
144
144
  login_fixture_librarian
145
145
 
146
146
  it 'assigns the requested series_statement as @series_statement' do
147
- series_statement = FactoryGirl.create(:series_statement)
147
+ series_statement = FactoryBot.create(:series_statement)
148
148
  get :edit, id: series_statement.id
149
149
  expect(assigns(:series_statement)).to eq(series_statement)
150
150
  end
@@ -154,7 +154,7 @@ describe SeriesStatementsController do
154
154
  login_fixture_user
155
155
 
156
156
  it 'assigns the requested series_statement as @series_statement' do
157
- series_statement = FactoryGirl.create(:series_statement)
157
+ series_statement = FactoryBot.create(:series_statement)
158
158
  get :edit, id: series_statement.id
159
159
  expect(response).to be_forbidden
160
160
  end
@@ -162,7 +162,7 @@ describe SeriesStatementsController do
162
162
 
163
163
  describe 'When not logged in' do
164
164
  it 'should not assign the requested series_statement as @series_statement' do
165
- series_statement = FactoryGirl.create(:series_statement)
165
+ series_statement = FactoryBot.create(:series_statement)
166
166
  get :edit, id: series_statement.id
167
167
  expect(response).to redirect_to(new_user_session_url)
168
168
  end
@@ -288,7 +288,7 @@ describe SeriesStatementsController do
288
288
 
289
289
  describe 'PUT update' do
290
290
  before(:each) do
291
- @series_statement = FactoryGirl.create(:series_statement)
291
+ @series_statement = FactoryBot.create(:series_statement)
292
292
  @attrs = valid_attributes
293
293
  @invalid_attrs = { original_title: '' }
294
294
  end
@@ -394,7 +394,7 @@ describe SeriesStatementsController do
394
394
 
395
395
  describe 'DELETE destroy' do
396
396
  before(:each) do
397
- @series_statement = FactoryGirl.create(:series_statement)
397
+ @series_statement = FactoryBot.create(:series_statement)
398
398
  end
399
399
 
400
400
  describe 'When logged in as Administrator' do
@@ -0,0 +1,5 @@
1
+ class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration
2
+ def change
3
+ add_attachment :library_groups, :header_logo
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration
2
+ def change
3
+ rename_column :library_groups, :login_banner, :old_login_banner
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration
2
+ def change
3
+ add_foreign_key :libraries, :library_groups, null: false
4
+ end
5
+ end
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended that you check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(version: 20160820004638) do
14
+ ActiveRecord::Schema.define(version: 20171126135238) do
15
15
 
16
16
  create_table "accepts", force: :cascade do |t|
17
17
  t.integer "basket_id"
@@ -674,7 +674,7 @@ ActiveRecord::Schema.define(version: 20160820004638) do
674
674
  t.string "binding_item_identifier"
675
675
  t.string "binding_call_number"
676
676
  t.datetime "binded_at"
677
- t.integer "manifestation_id"
677
+ t.integer "manifestation_id", null: false
678
678
  end
679
679
 
680
680
  add_index "items", ["binding_item_identifier"], name: "index_items_on_binding_item_identifier"
@@ -764,7 +764,7 @@ ActiveRecord::Schema.define(version: 20160820004638) do
764
764
  t.text "display_name"
765
765
  t.string "short_name", null: false
766
766
  t.text "my_networks"
767
- t.text "login_banner"
767
+ t.text "old_login_banner"
768
768
  t.text "note"
769
769
  t.integer "country_id"
770
770
  t.integer "position"
@@ -781,6 +781,10 @@ ActiveRecord::Schema.define(version: 20160820004638) do
781
781
  t.string "screenshot_generator"
782
782
  t.integer "pub_year_facet_range_interval", default: 10
783
783
  t.integer "user_id"
784
+ t.string "header_logo_file_name"
785
+ t.string "header_logo_content_type"
786
+ t.integer "header_logo_file_size"
787
+ t.datetime "header_logo_updated_at"
784
788
  end
785
789
 
786
790
  add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :agent do |f|
3
3
  f.sequence(:full_name){|n| "full_name_#{n}"}
4
4
  f.agent_type_id{AgentType.find_by_name('person').id}
@@ -7,7 +7,7 @@ FactoryGirl.define do
7
7
  end
8
8
  end
9
9
 
10
- FactoryGirl.define do
10
+ FactoryBot.define do
11
11
  factory :invalid_agent, :class => Agent do |f|
12
12
  end
13
13
  end