enju_biblio 0.1.0.pre56 → 0.1.0.pre57

Sign up to get free protection for your applications and to get access to all the features.
Files changed (192) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/agent_import_files_controller.rb +1 -1
  3. data/app/controllers/agent_import_results_controller.rb +30 -6
  4. data/app/controllers/agent_relationship_types_controller.rb +74 -4
  5. data/app/controllers/agent_relationships_controller.rb +92 -10
  6. data/app/controllers/agent_types_controller.rb +74 -3
  7. data/app/controllers/carrier_types_controller.rb +1 -1
  8. data/app/controllers/content_types_controller.rb +74 -4
  9. data/app/controllers/countries_controller.rb +66 -4
  10. data/app/controllers/create_types_controller.rb +74 -3
  11. data/app/controllers/extents_controller.rb +74 -4
  12. data/app/controllers/form_of_works_controller.rb +74 -4
  13. data/app/controllers/frequencies_controller.rb +74 -4
  14. data/app/controllers/identifier_types_controller.rb +4 -5
  15. data/app/controllers/import_requests_controller.rb +1 -1
  16. data/app/controllers/languages_controller.rb +66 -4
  17. data/app/controllers/licenses_controller.rb +74 -3
  18. data/app/controllers/manifestation_relationship_types_controller.rb +74 -3
  19. data/app/controllers/manifestation_relationships_controller.rb +92 -9
  20. data/app/controllers/medium_of_performances_controller.rb +74 -3
  21. data/app/controllers/picture_files_controller.rb +34 -10
  22. data/app/controllers/produce_types_controller.rb +74 -3
  23. data/app/controllers/realize_types_controller.rb +74 -3
  24. data/app/controllers/resource_import_files_controller.rb +2 -1
  25. data/app/controllers/resource_import_results_controller.rb +31 -11
  26. data/app/models/agent_import_file.rb +1 -1
  27. data/app/models/agent_import_result.rb +0 -2
  28. data/app/models/carrier_type.rb +1 -1
  29. data/app/models/identifier.rb +5 -0
  30. data/app/models/item.rb +1 -1
  31. data/app/models/manifestation.rb +13 -8
  32. data/app/models/resource_import_file.rb +73 -79
  33. data/app/views/agent_import_files/index.html.erb +1 -0
  34. data/app/views/agent_relationship_types/index.html.erb +5 -4
  35. data/app/views/agent_types/index.html.erb +5 -4
  36. data/app/views/carrier_types/index.html.erb +2 -1
  37. data/app/views/content_types/index.html.erb +1 -0
  38. data/app/views/countries/show.html.erb +5 -0
  39. data/app/views/create_types/index.html.erb +5 -4
  40. data/app/views/extents/index.html.erb +2 -1
  41. data/app/views/form_of_works/index.html.erb +2 -1
  42. data/app/views/frequencies/index.html.erb +2 -1
  43. data/app/views/identifier_types/index.html.erb +12 -5
  44. data/app/views/import_requests/index.html.erb +1 -0
  45. data/app/views/items/show.html.erb +3 -7
  46. data/app/views/languages/_form.html.erb +19 -4
  47. data/app/views/languages/index.html.erb +6 -5
  48. data/app/views/languages/show.html.erb +19 -4
  49. data/app/views/layouts/manifestations.html.erb +2 -1
  50. data/app/views/licenses/index.html.erb +2 -1
  51. data/app/views/manifestation_relationship_types/index.html.erb +5 -4
  52. data/app/views/manifestations/_call_number.html.erb +1 -1
  53. data/app/views/manifestations/_edit_detail.html.erb +4 -1
  54. data/app/views/manifestations/_form.html.erb +5 -5
  55. data/app/views/manifestations/_show_detail_librarian.html.erb +8 -3
  56. data/app/views/manifestations/_show_detail_user.html.erb +8 -3
  57. data/app/views/medium_of_performances/index.html.erb +2 -1
  58. data/app/views/notifier/manifestation_info.en.text.erb +1 -1
  59. data/app/views/notifier/manifestation_info.ja.text.erb +1 -1
  60. data/app/views/picture_files/_index.html.erb +1 -0
  61. data/app/views/picture_files/_index_agent.html.erb +1 -0
  62. data/app/views/picture_files/_index_manifestation.html.erb +1 -0
  63. data/app/views/picture_files/show.html.erb +15 -7
  64. data/app/views/produce_types/index.html.erb +5 -4
  65. data/app/views/realize_types/index.html.erb +5 -4
  66. data/app/views/resource_import_files/index.html.erb +1 -0
  67. data/app/views/series_statements/_index.html.erb +1 -0
  68. data/app/views/series_statements/_index_series_statement_merge_list.html.erb +1 -0
  69. data/config/locales/translation_en.yml +70 -1
  70. data/config/locales/translation_ja.yml +77 -8
  71. data/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb +5 -0
  72. data/lib/enju_biblio/biblio_helper.rb +13 -0
  73. data/lib/enju_biblio/engine.rb +0 -2
  74. data/lib/enju_biblio/version.rb +1 -1
  75. data/lib/generators/enju_biblio/setup/templates/db/fixtures/content_types.yml +1 -1
  76. data/lib/generators/enju_biblio/setup/templates/db/fixtures/identifier_types.yml +24 -3
  77. data/lib/tasks/enju_biblio_tasks.rake +2 -0
  78. data/lib/tasks/identifier_type.rb +12 -0
  79. data/lib/tasks/item.rb +1 -1
  80. 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 +433 -0
  81. data/spec/controllers/agent_import_files_controller_spec.rb +35 -35
  82. data/spec/controllers/agent_import_results_controller_spec.rb +11 -11
  83. data/spec/controllers/agent_relationship_types_controller_spec.rb +51 -51
  84. data/spec/controllers/agent_relationships_controller_spec.rb +53 -53
  85. data/spec/controllers/agent_types_controller_spec.rb +15 -15
  86. data/spec/controllers/agents_controller_spec.rb +96 -96
  87. data/spec/controllers/carrier_types_controller_spec.rb +15 -15
  88. data/spec/controllers/content_types_controller_spec.rb +15 -15
  89. data/spec/controllers/countries_controller_spec.rb +25 -25
  90. data/spec/controllers/create_types_controller_spec.rb +15 -15
  91. data/spec/controllers/creates_controller_spec.rb +50 -50
  92. data/spec/controllers/donates_controller_spec.rb +49 -49
  93. data/spec/controllers/extents_controller_spec.rb +15 -15
  94. data/spec/controllers/form_of_works_controller_spec.rb +15 -15
  95. data/spec/controllers/frequencies_controller_spec.rb +6 -6
  96. data/spec/controllers/identifier_types_controller_spec.rb +15 -15
  97. data/spec/controllers/import_requests_controller_spec.rb +50 -50
  98. data/spec/controllers/items_controller_spec.rb +72 -72
  99. data/spec/controllers/languages_controller_spec.rb +18 -18
  100. data/spec/controllers/licenses_controller_spec.rb +15 -15
  101. data/spec/controllers/manifestation_relationship_types_controller_spec.rb +51 -51
  102. data/spec/controllers/manifestation_relationships_controller_spec.rb +53 -53
  103. data/spec/controllers/manifestations_controller_spec.rb +108 -108
  104. data/spec/controllers/medium_of_performances_controller_spec.rb +15 -15
  105. data/spec/controllers/owns_controller_spec.rb +52 -52
  106. data/spec/controllers/picture_files_controller_spec.rb +52 -52
  107. data/spec/controllers/produce_types_controller_spec.rb +15 -15
  108. data/spec/controllers/produces_controller_spec.rb +50 -50
  109. data/spec/controllers/realize_types_controller_spec.rb +15 -15
  110. data/spec/controllers/realizes_controller_spec.rb +51 -51
  111. data/spec/controllers/resource_export_files_controller_spec.rb +38 -38
  112. data/spec/controllers/resource_import_files_controller_spec.rb +38 -38
  113. data/spec/controllers/resource_import_results_controller_spec.rb +15 -15
  114. data/spec/controllers/series_statements_controller_spec.rb +54 -54
  115. data/spec/dummy/db/development.sqlite3 +0 -0
  116. data/spec/dummy/db/schema.rb +2 -3
  117. data/spec/dummy/db/test.sqlite3 +0 -0
  118. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv +19 -19
  119. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv +19 -19
  120. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-53863-1jz1wlr.txt +147 -0
  121. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-55246-1rvhs1s.txt +147 -0
  122. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-60268-1psjqua.txt +147 -0
  123. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-60996-1cy28m2.txt +147 -0
  124. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-67507-19qjhj3.txt +147 -0
  125. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-69234-1cllrec.txt +147 -0
  126. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-76875-1os6joy.txt +147 -0
  127. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-1148-136brhb.txt +147 -0
  128. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-473-1c326dm.txt +147 -0
  129. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-93795-1x882ik.txt +147 -0
  130. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-94274-1xr9d9e.txt +147 -0
  131. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-94643-1fjcept.txt +147 -0
  132. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-97947-mfqh5b.txt +147 -0
  133. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-98488-126cvb4.txt +147 -0
  134. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-98849-1lg47mm.txt +147 -0
  135. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  136. data/spec/dummy/solr/test/data/index/segments_5ur +0 -0
  137. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007580 +0 -0
  138. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007581 +0 -0
  139. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007582 +0 -0
  140. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007583 +0 -0
  141. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007584 +0 -0
  142. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007585 +0 -0
  143. data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
  144. data/spec/dummy/tmp/cache/stdout +2554 -0
  145. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  146. data/spec/fixtures/agent_import_results.yml +0 -3
  147. data/spec/fixtures/carrier_types.yml +16 -16
  148. data/spec/fixtures/content_types.yml +78 -29
  149. data/spec/fixtures/frequencies.yml +32 -62
  150. data/spec/fixtures/manifestations.yml +1 -1
  151. data/spec/models/agent_import_result_spec.rb +0 -2
  152. data/spec/models/manifestation_spec.rb +1 -1
  153. data/spec/models/resource_import_file_spec.rb +30 -3
  154. data/spec/views/manifestations/show.html.erb_spec.rb +1 -1
  155. metadata +68 -103
  156. data/app/views/picture_files/_index_event.html.erb +0 -53
  157. data/app/views/picture_files/_index_shelf.html.erb +0 -53
  158. data/db/migrate/20121116033446_add_doi_to_manifestation.rb +0 -6
  159. data/spec/dummy/solr/test/data/index/_20i.fdt +0 -0
  160. data/spec/dummy/solr/test/data/index/_20i.fdx +0 -0
  161. data/spec/dummy/solr/test/data/index/_20i.fnm +0 -0
  162. data/spec/dummy/solr/test/data/index/_20i.nvd +0 -0
  163. data/spec/dummy/solr/test/data/index/_20i.nvm +0 -0
  164. data/spec/dummy/solr/test/data/index/_20i.si +0 -0
  165. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.doc +0 -0
  166. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.pos +0 -0
  167. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.tim +0 -0
  168. data/spec/dummy/solr/test/data/index/_20i_Lucene41_0.tip +0 -0
  169. data/spec/dummy/solr/test/data/index/_20j.fdt +0 -0
  170. data/spec/dummy/solr/test/data/index/_20j.fdx +0 -0
  171. data/spec/dummy/solr/test/data/index/_20j.fnm +0 -0
  172. data/spec/dummy/solr/test/data/index/_20j.nvd +0 -0
  173. data/spec/dummy/solr/test/data/index/_20j.nvm +0 -0
  174. data/spec/dummy/solr/test/data/index/_20j.si +0 -0
  175. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.doc +0 -0
  176. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.pos +0 -0
  177. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.tim +0 -0
  178. data/spec/dummy/solr/test/data/index/_20j_Lucene41_0.tip +0 -0
  179. data/spec/dummy/solr/test/data/index/_20k.fdt +0 -0
  180. data/spec/dummy/solr/test/data/index/_20k.fdx +0 -0
  181. data/spec/dummy/solr/test/data/index/_20k.fnm +0 -0
  182. data/spec/dummy/solr/test/data/index/_20k.nvd +0 -0
  183. data/spec/dummy/solr/test/data/index/_20k.nvm +0 -0
  184. data/spec/dummy/solr/test/data/index/_20k.si +0 -0
  185. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.doc +0 -0
  186. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.pos +0 -0
  187. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.tim +0 -0
  188. data/spec/dummy/solr/test/data/index/_20k_Lucene41_0.tip +0 -0
  189. data/spec/dummy/solr/test/data/index/segments_2uc +0 -0
  190. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000003680 +0 -0
  191. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000003681 +0 -0
  192. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000003682 +0 -0
@@ -15,7 +15,7 @@ describe DonatesController do
15
15
 
16
16
  it "assigns all donates as @donates" do
17
17
  get :index
18
- assigns(:donates).should eq(Donate.order('id DESC').page(1))
18
+ expect(assigns(:donates)).to eq(Donate.order('id DESC').page(1))
19
19
  end
20
20
  end
21
21
 
@@ -24,7 +24,7 @@ describe DonatesController do
24
24
 
25
25
  it "assigns all donates as @donates" do
26
26
  get :index
27
- assigns(:donates).should eq(Donate.order('id DESC').page(1))
27
+ expect(assigns(:donates)).to eq(Donate.order('id DESC').page(1))
28
28
  end
29
29
  end
30
30
 
@@ -33,14 +33,14 @@ describe DonatesController do
33
33
 
34
34
  it "assigns all donates as @donates" do
35
35
  get :index
36
- assigns(:donates).should be_empty
36
+ expect(assigns(:donates)).to be_empty
37
37
  end
38
38
  end
39
39
 
40
40
  describe "When not logged in" do
41
41
  it "assigns all donates as @donates" do
42
42
  get :index
43
- assigns(:donates).should be_empty
43
+ expect(assigns(:donates)).to be_empty
44
44
  end
45
45
  end
46
46
  end
@@ -52,7 +52,7 @@ describe DonatesController do
52
52
  it "assigns the requested donate as @donate" do
53
53
  donate = FactoryGirl.create(:donate)
54
54
  get :show, :id => donate.id
55
- assigns(:donate).should eq(donate)
55
+ expect(assigns(:donate)).to eq(donate)
56
56
  end
57
57
  end
58
58
 
@@ -62,7 +62,7 @@ describe DonatesController do
62
62
  it "assigns the requested donate as @donate" do
63
63
  donate = FactoryGirl.create(:donate)
64
64
  get :show, :id => donate.id
65
- assigns(:donate).should eq(donate)
65
+ expect(assigns(:donate)).to eq(donate)
66
66
  end
67
67
  end
68
68
 
@@ -72,7 +72,7 @@ describe DonatesController do
72
72
  it "assigns the requested donate as @donate" do
73
73
  donate = FactoryGirl.create(:donate)
74
74
  get :show, :id => donate.id
75
- assigns(:donate).should eq(donate)
75
+ expect(assigns(:donate)).to eq(donate)
76
76
  end
77
77
  end
78
78
 
@@ -80,7 +80,7 @@ describe DonatesController do
80
80
  it "assigns the requested donate as @donate" do
81
81
  donate = FactoryGirl.create(:donate)
82
82
  get :show, :id => donate.id
83
- assigns(:donate).should eq(donate)
83
+ expect(assigns(:donate)).to eq(donate)
84
84
  end
85
85
  end
86
86
  end
@@ -91,7 +91,7 @@ describe DonatesController do
91
91
 
92
92
  it "assigns the requested donate as @donate" do
93
93
  get :new
94
- assigns(:donate).should_not be_valid
94
+ expect(assigns(:donate)).not_to be_valid
95
95
  end
96
96
  end
97
97
 
@@ -100,7 +100,7 @@ describe DonatesController do
100
100
 
101
101
  it "assigns the requested donate as @donate" do
102
102
  get :new
103
- assigns(:donate).should_not be_valid
103
+ expect(assigns(:donate)).not_to be_valid
104
104
  end
105
105
  end
106
106
 
@@ -109,16 +109,16 @@ describe DonatesController do
109
109
 
110
110
  it "should not assign the requested donate as @donate" do
111
111
  get :new
112
- assigns(:donate).should_not be_valid
113
- response.should be_forbidden
112
+ expect(assigns(:donate)).not_to be_valid
113
+ expect(response).to be_forbidden
114
114
  end
115
115
  end
116
116
 
117
117
  describe "When not logged in" do
118
118
  it "should not assign the requested donate as @donate" do
119
119
  get :new
120
- assigns(:donate).should_not be_valid
121
- response.should redirect_to(new_user_session_url)
120
+ expect(assigns(:donate)).not_to be_valid
121
+ expect(response).to redirect_to(new_user_session_url)
122
122
  end
123
123
  end
124
124
  end
@@ -130,7 +130,7 @@ describe DonatesController do
130
130
  it "assigns the requested donate as @donate" do
131
131
  donate = FactoryGirl.create(:donate)
132
132
  get :edit, :id => donate.id
133
- assigns(:donate).should eq(donate)
133
+ expect(assigns(:donate)).to eq(donate)
134
134
  end
135
135
  end
136
136
 
@@ -140,7 +140,7 @@ describe DonatesController do
140
140
  it "assigns the requested donate as @donate" do
141
141
  donate = FactoryGirl.create(:donate)
142
142
  get :edit, :id => donate.id
143
- assigns(:donate).should eq(donate)
143
+ expect(assigns(:donate)).to eq(donate)
144
144
  end
145
145
  end
146
146
 
@@ -150,7 +150,7 @@ describe DonatesController do
150
150
  it "assigns the requested donate as @donate" do
151
151
  donate = FactoryGirl.create(:donate)
152
152
  get :edit, :id => donate.id
153
- response.should be_forbidden
153
+ expect(response).to be_forbidden
154
154
  end
155
155
  end
156
156
 
@@ -158,7 +158,7 @@ describe DonatesController do
158
158
  it "should not assign the requested donate as @donate" do
159
159
  donate = FactoryGirl.create(:donate)
160
160
  get :edit, :id => donate.id
161
- response.should redirect_to(new_user_session_url)
161
+ expect(response).to redirect_to(new_user_session_url)
162
162
  end
163
163
  end
164
164
  end
@@ -175,24 +175,24 @@ describe DonatesController do
175
175
  describe "with valid params" do
176
176
  it "assigns a newly created donate as @donate" do
177
177
  post :create, :donate => @attrs
178
- assigns(:donate).should be_valid
178
+ expect(assigns(:donate)).to be_valid
179
179
  end
180
180
 
181
181
  it "redirects to the created donate" do
182
182
  post :create, :donate => @attrs
183
- response.should redirect_to(donate_url(assigns(:donate)))
183
+ expect(response).to redirect_to(donate_url(assigns(:donate)))
184
184
  end
185
185
  end
186
186
 
187
187
  describe "with invalid params" do
188
188
  it "assigns a newly created but unsaved donate as @donate" do
189
189
  post :create, :donate => @invalid_attrs
190
- assigns(:donate).should_not be_valid
190
+ expect(assigns(:donate)).not_to be_valid
191
191
  end
192
192
 
193
193
  it "re-renders the 'new' template" do
194
194
  post :create, :donate => @invalid_attrs
195
- response.should render_template("new")
195
+ expect(response).to render_template("new")
196
196
  end
197
197
  end
198
198
  end
@@ -203,24 +203,24 @@ describe DonatesController do
203
203
  describe "with valid params" do
204
204
  it "assigns a newly created donate as @donate" do
205
205
  post :create, :donate => @attrs
206
- assigns(:donate).should be_valid
206
+ expect(assigns(:donate)).to be_valid
207
207
  end
208
208
 
209
209
  it "redirects to the created donate" do
210
210
  post :create, :donate => @attrs
211
- response.should redirect_to(donate_url(assigns(:donate)))
211
+ expect(response).to redirect_to(donate_url(assigns(:donate)))
212
212
  end
213
213
  end
214
214
 
215
215
  describe "with invalid params" do
216
216
  it "assigns a newly created but unsaved donate as @donate" do
217
217
  post :create, :donate => @invalid_attrs
218
- assigns(:donate).should_not be_valid
218
+ expect(assigns(:donate)).not_to be_valid
219
219
  end
220
220
 
221
221
  it "re-renders the 'new' template" do
222
222
  post :create, :donate => @invalid_attrs
223
- response.should render_template("new")
223
+ expect(response).to render_template("new")
224
224
  end
225
225
  end
226
226
  end
@@ -231,24 +231,24 @@ describe DonatesController do
231
231
  describe "with valid params" do
232
232
  it "assigns a newly created donate as @donate" do
233
233
  post :create, :donate => @attrs
234
- assigns(:donate).should be_valid
234
+ expect(assigns(:donate)).to be_valid
235
235
  end
236
236
 
237
237
  it "should be forbidden" do
238
238
  post :create, :donate => @attrs
239
- response.should be_forbidden
239
+ expect(response).to be_forbidden
240
240
  end
241
241
  end
242
242
 
243
243
  describe "with invalid params" do
244
244
  it "assigns a newly created but unsaved donate as @donate" do
245
245
  post :create, :donate => @invalid_attrs
246
- assigns(:donate).should_not be_valid
246
+ expect(assigns(:donate)).not_to be_valid
247
247
  end
248
248
 
249
249
  it "should be forbidden" do
250
250
  post :create, :donate => @invalid_attrs
251
- response.should be_forbidden
251
+ expect(response).to be_forbidden
252
252
  end
253
253
  end
254
254
  end
@@ -257,24 +257,24 @@ describe DonatesController do
257
257
  describe "with valid params" do
258
258
  it "assigns a newly created donate as @donate" do
259
259
  post :create, :donate => @attrs
260
- assigns(:donate).should be_valid
260
+ expect(assigns(:donate)).to be_valid
261
261
  end
262
262
 
263
263
  it "should be forbidden" do
264
264
  post :create, :donate => @attrs
265
- response.should redirect_to(new_user_session_url)
265
+ expect(response).to redirect_to(new_user_session_url)
266
266
  end
267
267
  end
268
268
 
269
269
  describe "with invalid params" do
270
270
  it "assigns a newly created but unsaved donate as @donate" do
271
271
  post :create, :donate => @invalid_attrs
272
- assigns(:donate).should_not be_valid
272
+ expect(assigns(:donate)).not_to be_valid
273
273
  end
274
274
 
275
275
  it "should be forbidden" do
276
276
  post :create, :donate => @invalid_attrs
277
- response.should redirect_to(new_user_session_url)
277
+ expect(response).to redirect_to(new_user_session_url)
278
278
  end
279
279
  end
280
280
  end
@@ -297,14 +297,14 @@ describe DonatesController do
297
297
 
298
298
  it "assigns the requested donate as @donate" do
299
299
  put :update, :id => @donate.id, :donate => @attrs
300
- assigns(:donate).should eq(@donate)
300
+ expect(assigns(:donate)).to eq(@donate)
301
301
  end
302
302
  end
303
303
 
304
304
  describe "with invalid params" do
305
305
  it "assigns the requested donate as @donate" do
306
306
  put :update, :id => @donate.id, :donate => @invalid_attrs
307
- response.should render_template("edit")
307
+ expect(response).to render_template("edit")
308
308
  end
309
309
  end
310
310
  end
@@ -319,20 +319,20 @@ describe DonatesController do
319
319
 
320
320
  it "assigns the requested donate as @donate" do
321
321
  put :update, :id => @donate.id, :donate => @attrs
322
- assigns(:donate).should eq(@donate)
323
- response.should redirect_to(@donate)
322
+ expect(assigns(:donate)).to eq(@donate)
323
+ expect(response).to redirect_to(@donate)
324
324
  end
325
325
  end
326
326
 
327
327
  describe "with invalid params" do
328
328
  it "assigns the donate as @donate" do
329
329
  put :update, :id => @donate, :donate => @invalid_attrs
330
- assigns(:donate).should_not be_valid
330
+ expect(assigns(:donate)).not_to be_valid
331
331
  end
332
332
 
333
333
  it "re-renders the 'edit' template" do
334
334
  put :update, :id => @donate, :donate => @invalid_attrs
335
- response.should render_template("edit")
335
+ expect(response).to render_template("edit")
336
336
  end
337
337
  end
338
338
  end
@@ -347,15 +347,15 @@ describe DonatesController do
347
347
 
348
348
  it "assigns the requested donate as @donate" do
349
349
  put :update, :id => @donate.id, :donate => @attrs
350
- assigns(:donate).should eq(@donate)
351
- response.should be_forbidden
350
+ expect(assigns(:donate)).to eq(@donate)
351
+ expect(response).to be_forbidden
352
352
  end
353
353
  end
354
354
 
355
355
  describe "with invalid params" do
356
356
  it "assigns the requested donate as @donate" do
357
357
  put :update, :id => @donate.id, :donate => @invalid_attrs
358
- response.should be_forbidden
358
+ expect(response).to be_forbidden
359
359
  end
360
360
  end
361
361
  end
@@ -368,14 +368,14 @@ describe DonatesController do
368
368
 
369
369
  it "should be forbidden" do
370
370
  put :update, :id => @donate.id, :donate => @attrs
371
- response.should redirect_to(new_user_session_url)
371
+ expect(response).to redirect_to(new_user_session_url)
372
372
  end
373
373
  end
374
374
 
375
375
  describe "with invalid params" do
376
376
  it "assigns the requested donate as @donate" do
377
377
  put :update, :id => @donate.id, :donate => @invalid_attrs
378
- response.should redirect_to(new_user_session_url)
378
+ expect(response).to redirect_to(new_user_session_url)
379
379
  end
380
380
  end
381
381
  end
@@ -395,7 +395,7 @@ describe DonatesController do
395
395
 
396
396
  it "redirects to the donates list" do
397
397
  delete :destroy, :id => @donate.id
398
- response.should redirect_to(donates_url)
398
+ expect(response).to redirect_to(donates_url)
399
399
  end
400
400
  end
401
401
 
@@ -408,7 +408,7 @@ describe DonatesController do
408
408
 
409
409
  it "should be forbidden" do
410
410
  delete :destroy, :id => @donate.id
411
- response.should redirect_to(donates_url)
411
+ expect(response).to redirect_to(donates_url)
412
412
  end
413
413
  end
414
414
 
@@ -421,7 +421,7 @@ describe DonatesController do
421
421
 
422
422
  it "should be forbidden" do
423
423
  delete :destroy, :id => @donate.id
424
- response.should be_forbidden
424
+ expect(response).to be_forbidden
425
425
  end
426
426
  end
427
427
 
@@ -432,7 +432,7 @@ describe DonatesController do
432
432
 
433
433
  it "should be forbidden" do
434
434
  delete :destroy, :id => @donate.id
435
- response.should redirect_to(new_user_session_url)
435
+ expect(response).to redirect_to(new_user_session_url)
436
436
  end
437
437
  end
438
438
  end
@@ -33,7 +33,7 @@ describe ExtentsController do
33
33
  it "assigns all extents as @extents" do
34
34
  extent = Extent.create! valid_attributes
35
35
  get :index
36
- assigns(:extents).should eq(Extent.all)
36
+ expect(assigns(:extents)).to eq(Extent.all)
37
37
  end
38
38
  end
39
39
 
@@ -41,14 +41,14 @@ describe ExtentsController do
41
41
  it "assigns the requested extent as @extent" do
42
42
  extent = Extent.create! valid_attributes
43
43
  get :show, :id => extent.id
44
- assigns(:extent).should eq(extent)
44
+ expect(assigns(:extent)).to eq(extent)
45
45
  end
46
46
  end
47
47
 
48
48
  describe "GET new" do
49
49
  it "assigns a new extent as @extent" do
50
50
  get :new
51
- assigns(:extent).should be_a_new(Extent)
51
+ expect(assigns(:extent)).to be_a_new(Extent)
52
52
  end
53
53
  end
54
54
 
@@ -56,7 +56,7 @@ describe ExtentsController do
56
56
  it "assigns the requested extent as @extent" do
57
57
  extent = Extent.create! valid_attributes
58
58
  get :edit, :id => extent.id
59
- assigns(:extent).should eq(extent)
59
+ expect(assigns(:extent)).to eq(extent)
60
60
  end
61
61
  end
62
62
 
@@ -70,13 +70,13 @@ describe ExtentsController do
70
70
 
71
71
  it "assigns a newly created extent as @extent" do
72
72
  post :create, :extent => valid_attributes
73
- assigns(:extent).should be_a(Extent)
74
- assigns(:extent).should be_persisted
73
+ expect(assigns(:extent)).to be_a(Extent)
74
+ expect(assigns(:extent)).to be_persisted
75
75
  end
76
76
 
77
77
  it "redirects to the created extent" do
78
78
  post :create, :extent => valid_attributes
79
- response.should redirect_to(Extent.last)
79
+ expect(response).to redirect_to(Extent.last)
80
80
  end
81
81
  end
82
82
 
@@ -85,14 +85,14 @@ describe ExtentsController do
85
85
  # Trigger the behavior that occurs when invalid params are submitted
86
86
  Extent.any_instance.stub(:save).and_return(false)
87
87
  post :create, :extent => {}
88
- assigns(:extent).should be_a_new(Extent)
88
+ expect(assigns(:extent)).to be_a_new(Extent)
89
89
  end
90
90
 
91
91
  it "re-renders the 'new' template" do
92
92
  # Trigger the behavior that occurs when invalid params are submitted
93
93
  Extent.any_instance.stub(:save).and_return(false)
94
94
  post :create, :extent => {}
95
- #response.should render_template("new")
95
+ #expect(response).to render_template("new")
96
96
  end
97
97
  end
98
98
  end
@@ -112,20 +112,20 @@ describe ExtentsController do
112
112
  it "assigns the requested extent as @extent" do
113
113
  extent = Extent.create! valid_attributes
114
114
  put :update, :id => extent.id, :extent => valid_attributes
115
- assigns(:extent).should eq(extent)
115
+ expect(assigns(:extent)).to eq(extent)
116
116
  end
117
117
 
118
118
  it "redirects to the extent" do
119
119
  extent = Extent.create! valid_attributes
120
120
  put :update, :id => extent.id, :extent => valid_attributes
121
- response.should redirect_to(extent)
121
+ expect(response).to redirect_to(extent)
122
122
  end
123
123
 
124
124
  it "moves its position when specified" do
125
125
  extent = Extent.create! valid_attributes
126
126
  position = extent.position
127
127
  put :update, :id => extent.id, :move => 'higher'
128
- response.should redirect_to extents_url
128
+ expect(response).to redirect_to extents_url
129
129
  assigns(:extent).position.should eq position - 1
130
130
  end
131
131
  end
@@ -136,7 +136,7 @@ describe ExtentsController do
136
136
  # Trigger the behavior that occurs when invalid params are submitted
137
137
  Extent.any_instance.stub(:save).and_return(false)
138
138
  put :update, :id => extent.id, :extent => {}
139
- assigns(:extent).should eq(extent)
139
+ expect(assigns(:extent)).to eq(extent)
140
140
  end
141
141
 
142
142
  it "re-renders the 'edit' template" do
@@ -144,7 +144,7 @@ describe ExtentsController do
144
144
  # Trigger the behavior that occurs when invalid params are submitted
145
145
  Extent.any_instance.stub(:save).and_return(false)
146
146
  put :update, :id => extent.id, :extent => {}
147
- #response.should render_template("edit")
147
+ #expect(response).to render_template("edit")
148
148
  end
149
149
  end
150
150
  end
@@ -160,7 +160,7 @@ describe ExtentsController do
160
160
  it "redirects to the extents list" do
161
161
  extent = Extent.create! valid_attributes
162
162
  delete :destroy, :id => extent.id
163
- response.should redirect_to(extents_url)
163
+ expect(response).to redirect_to(extents_url)
164
164
  end
165
165
  end
166
166
 
@@ -33,7 +33,7 @@ describe FormOfWorksController do
33
33
  it "assigns all form_of_works as @form_of_works" do
34
34
  form_of_work = FormOfWork.create! valid_attributes
35
35
  get :index
36
- assigns(:form_of_works).should eq(FormOfWork.all)
36
+ expect(assigns(:form_of_works)).to eq(FormOfWork.all)
37
37
  end
38
38
  end
39
39
 
@@ -41,14 +41,14 @@ describe FormOfWorksController do
41
41
  it "assigns the requested form_of_work as @form_of_work" do
42
42
  form_of_work = FormOfWork.create! valid_attributes
43
43
  get :show, :id => form_of_work.id
44
- assigns(:form_of_work).should eq(form_of_work)
44
+ expect(assigns(:form_of_work)).to eq(form_of_work)
45
45
  end
46
46
  end
47
47
 
48
48
  describe "GET new" do
49
49
  it "assigns a new form_of_work as @form_of_work" do
50
50
  get :new
51
- assigns(:form_of_work).should be_a_new(FormOfWork)
51
+ expect(assigns(:form_of_work)).to be_a_new(FormOfWork)
52
52
  end
53
53
  end
54
54
 
@@ -56,7 +56,7 @@ describe FormOfWorksController do
56
56
  it "assigns the requested form_of_work as @form_of_work" do
57
57
  form_of_work = FormOfWork.create! valid_attributes
58
58
  get :edit, :id => form_of_work.id
59
- assigns(:form_of_work).should eq(form_of_work)
59
+ expect(assigns(:form_of_work)).to eq(form_of_work)
60
60
  end
61
61
  end
62
62
 
@@ -70,13 +70,13 @@ describe FormOfWorksController do
70
70
 
71
71
  it "assigns a newly created form_of_work as @form_of_work" do
72
72
  post :create, :form_of_work => valid_attributes
73
- assigns(:form_of_work).should be_a(FormOfWork)
74
- assigns(:form_of_work).should be_persisted
73
+ expect(assigns(:form_of_work)).to be_a(FormOfWork)
74
+ expect(assigns(:form_of_work)).to be_persisted
75
75
  end
76
76
 
77
77
  it "redirects to the created form_of_work" do
78
78
  post :create, :form_of_work => valid_attributes
79
- response.should redirect_to(FormOfWork.last)
79
+ expect(response).to redirect_to(FormOfWork.last)
80
80
  end
81
81
  end
82
82
 
@@ -85,14 +85,14 @@ describe FormOfWorksController do
85
85
  # Trigger the behavior that occurs when invalid params are submitted
86
86
  FormOfWork.any_instance.stub(:save).and_return(false)
87
87
  post :create, :form_of_work => {}
88
- assigns(:form_of_work).should be_a_new(FormOfWork)
88
+ expect(assigns(:form_of_work)).to be_a_new(FormOfWork)
89
89
  end
90
90
 
91
91
  it "re-renders the 'new' template" do
92
92
  # Trigger the behavior that occurs when invalid params are submitted
93
93
  FormOfWork.any_instance.stub(:save).and_return(false)
94
94
  post :create, :form_of_work => {}
95
- #response.should render_template("new")
95
+ #expect(response).to render_template("new")
96
96
  end
97
97
  end
98
98
  end
@@ -112,20 +112,20 @@ describe FormOfWorksController do
112
112
  it "assigns the requested form_of_work as @form_of_work" do
113
113
  form_of_work = FormOfWork.create! valid_attributes
114
114
  put :update, :id => form_of_work.id, :form_of_work => valid_attributes
115
- assigns(:form_of_work).should eq(form_of_work)
115
+ expect(assigns(:form_of_work)).to eq(form_of_work)
116
116
  end
117
117
 
118
118
  it "redirects to the form_of_work" do
119
119
  form_of_work = FormOfWork.create! valid_attributes
120
120
  put :update, :id => form_of_work.id, :form_of_work => valid_attributes
121
- response.should redirect_to(form_of_work)
121
+ expect(response).to redirect_to(form_of_work)
122
122
  end
123
123
 
124
124
  it "moves its position when specified" do
125
125
  form_of_work = FormOfWork.create! valid_attributes
126
126
  position = form_of_work.position
127
127
  put :update, :id => form_of_work.id, :move => 'higher'
128
- response.should redirect_to form_of_works_url
128
+ expect(response).to redirect_to form_of_works_url
129
129
  assigns(:form_of_work).position.should eq position - 1
130
130
  end
131
131
  end
@@ -136,7 +136,7 @@ describe FormOfWorksController do
136
136
  # Trigger the behavior that occurs when invalid params are submitted
137
137
  FormOfWork.any_instance.stub(:save).and_return(false)
138
138
  put :update, :id => form_of_work.id, :form_of_work => {}
139
- assigns(:form_of_work).should eq(form_of_work)
139
+ expect(assigns(:form_of_work)).to eq(form_of_work)
140
140
  end
141
141
 
142
142
  it "re-renders the 'edit' template" do
@@ -144,7 +144,7 @@ describe FormOfWorksController do
144
144
  # Trigger the behavior that occurs when invalid params are submitted
145
145
  FormOfWork.any_instance.stub(:save).and_return(false)
146
146
  put :update, :id => form_of_work.id, :form_of_work => {}
147
- #response.should render_template("edit")
147
+ #expect(response).to render_template("edit")
148
148
  end
149
149
  end
150
150
  end
@@ -160,7 +160,7 @@ describe FormOfWorksController do
160
160
  it "redirects to the form_of_works list" do
161
161
  form_of_work = FormOfWork.create! valid_attributes
162
162
  delete :destroy, :id => form_of_work.id
163
- response.should redirect_to(form_of_works_url)
163
+ expect(response).to redirect_to(form_of_works_url)
164
164
  end
165
165
  end
166
166
 
@@ -76,7 +76,7 @@ describe FrequenciesController do
76
76
 
77
77
  it "redirects to the created frequency" do
78
78
  post :create, :frequency => valid_attributes
79
- response.should redirect_to(Frequency.last)
79
+ expect(response).to redirect_to(Frequency.last)
80
80
  end
81
81
  end
82
82
 
@@ -92,7 +92,7 @@ describe FrequenciesController do
92
92
  # Trigger the behavior that occurs when invalid params are submitted
93
93
  Frequency.any_instance.stub(:save).and_return(false)
94
94
  post :create, :frequency => {}
95
- #response.should render_template("new")
95
+ #expect(response).to render_template("new")
96
96
  end
97
97
  end
98
98
  end
@@ -118,14 +118,14 @@ describe FrequenciesController do
118
118
  it "redirects to the frequency" do
119
119
  frequency = Frequency.create! valid_attributes
120
120
  put :update, :id => frequency.id, :frequency => valid_attributes
121
- response.should redirect_to(frequency)
121
+ expect(response).to redirect_to(frequency)
122
122
  end
123
123
 
124
124
  it "moves its position when specified" do
125
125
  frequency = Frequency.create! valid_attributes
126
126
  position = frequency.position
127
127
  put :update, :id => frequency.id, :move => 'higher'
128
- response.should redirect_to frequencies_url
128
+ expect(response).to redirect_to frequencies_url
129
129
  assigns(:frequency).position.should eq position - 1
130
130
  end
131
131
  end
@@ -144,7 +144,7 @@ describe FrequenciesController do
144
144
  # Trigger the behavior that occurs when invalid params are submitted
145
145
  Frequency.any_instance.stub(:save).and_return(false)
146
146
  put :update, :id => frequency.id, :frequency => {}
147
- #response.should render_template("edit")
147
+ #expect(response).to render_template("edit")
148
148
  end
149
149
  end
150
150
  end
@@ -160,7 +160,7 @@ describe FrequenciesController do
160
160
  it "redirects to the frequencies list" do
161
161
  frequency = Frequency.create! valid_attributes
162
162
  delete :destroy, :id => frequency.id
163
- response.should redirect_to(frequencies_url)
163
+ expect(response).to redirect_to(frequencies_url)
164
164
  end
165
165
  end
166
166