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
@@ -33,7 +33,7 @@ describe MediumOfPerformancesController do
33
33
  it "assigns all medium_of_performances as @medium_of_performances" do
34
34
  medium_of_performance = MediumOfPerformance.create! valid_attributes
35
35
  get :index
36
- assigns(:medium_of_performances).should eq(MediumOfPerformance.all)
36
+ expect(assigns(:medium_of_performances)).to eq(MediumOfPerformance.all)
37
37
  end
38
38
  end
39
39
 
@@ -41,14 +41,14 @@ describe MediumOfPerformancesController do
41
41
  it "assigns the requested medium_of_performance as @medium_of_performance" do
42
42
  medium_of_performance = MediumOfPerformance.create! valid_attributes
43
43
  get :show, :id => medium_of_performance.id
44
- assigns(:medium_of_performance).should eq(medium_of_performance)
44
+ expect(assigns(:medium_of_performance)).to eq(medium_of_performance)
45
45
  end
46
46
  end
47
47
 
48
48
  describe "GET new" do
49
49
  it "assigns a new medium_of_performance as @medium_of_performance" do
50
50
  get :new
51
- assigns(:medium_of_performance).should be_a_new(MediumOfPerformance)
51
+ expect(assigns(:medium_of_performance)).to be_a_new(MediumOfPerformance)
52
52
  end
53
53
  end
54
54
 
@@ -56,7 +56,7 @@ describe MediumOfPerformancesController do
56
56
  it "assigns the requested medium_of_performance as @medium_of_performance" do
57
57
  medium_of_performance = MediumOfPerformance.create! valid_attributes
58
58
  get :edit, :id => medium_of_performance.id
59
- assigns(:medium_of_performance).should eq(medium_of_performance)
59
+ expect(assigns(:medium_of_performance)).to eq(medium_of_performance)
60
60
  end
61
61
  end
62
62
 
@@ -70,13 +70,13 @@ describe MediumOfPerformancesController do
70
70
 
71
71
  it "assigns a newly created medium_of_performance as @medium_of_performance" do
72
72
  post :create, :medium_of_performance => valid_attributes
73
- assigns(:medium_of_performance).should be_a(MediumOfPerformance)
74
- assigns(:medium_of_performance).should be_persisted
73
+ expect(assigns(:medium_of_performance)).to be_a(MediumOfPerformance)
74
+ expect(assigns(:medium_of_performance)).to be_persisted
75
75
  end
76
76
 
77
77
  it "redirects to the created medium_of_performance" do
78
78
  post :create, :medium_of_performance => valid_attributes
79
- response.should redirect_to(MediumOfPerformance.last)
79
+ expect(response).to redirect_to(MediumOfPerformance.last)
80
80
  end
81
81
  end
82
82
 
@@ -85,14 +85,14 @@ describe MediumOfPerformancesController do
85
85
  # Trigger the behavior that occurs when invalid params are submitted
86
86
  MediumOfPerformance.any_instance.stub(:save).and_return(false)
87
87
  post :create, :medium_of_performance => {}
88
- assigns(:medium_of_performance).should be_a_new(MediumOfPerformance)
88
+ expect(assigns(:medium_of_performance)).to be_a_new(MediumOfPerformance)
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
  MediumOfPerformance.any_instance.stub(:save).and_return(false)
94
94
  post :create, :medium_of_performance => {}
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 MediumOfPerformancesController do
112
112
  it "assigns the requested medium_of_performance as @medium_of_performance" do
113
113
  medium_of_performance = MediumOfPerformance.create! valid_attributes
114
114
  put :update, :id => medium_of_performance.id, :medium_of_performance => valid_attributes
115
- assigns(:medium_of_performance).should eq(medium_of_performance)
115
+ expect(assigns(:medium_of_performance)).to eq(medium_of_performance)
116
116
  end
117
117
 
118
118
  it "redirects to the medium_of_performance" do
119
119
  medium_of_performance = MediumOfPerformance.create! valid_attributes
120
120
  put :update, :id => medium_of_performance.id, :medium_of_performance => valid_attributes
121
- response.should redirect_to(medium_of_performance)
121
+ expect(response).to redirect_to(medium_of_performance)
122
122
  end
123
123
 
124
124
  it "moves its position when specified" do
125
125
  medium_of_performance = MediumOfPerformance.create! valid_attributes
126
126
  position = medium_of_performance.position
127
127
  put :update, :id => medium_of_performance.id, :move => 'higher'
128
- response.should redirect_to medium_of_performances_url
128
+ expect(response).to redirect_to medium_of_performances_url
129
129
  assigns(:medium_of_performance).position.should eq position - 1
130
130
  end
131
131
  end
@@ -136,7 +136,7 @@ describe MediumOfPerformancesController do
136
136
  # Trigger the behavior that occurs when invalid params are submitted
137
137
  MediumOfPerformance.any_instance.stub(:save).and_return(false)
138
138
  put :update, :id => medium_of_performance.id, :medium_of_performance => {}
139
- assigns(:medium_of_performance).should eq(medium_of_performance)
139
+ expect(assigns(:medium_of_performance)).to eq(medium_of_performance)
140
140
  end
141
141
 
142
142
  it "re-renders the 'edit' template" do
@@ -144,7 +144,7 @@ describe MediumOfPerformancesController do
144
144
  # Trigger the behavior that occurs when invalid params are submitted
145
145
  MediumOfPerformance.any_instance.stub(:save).and_return(false)
146
146
  put :update, :id => medium_of_performance.id, :medium_of_performance => {}
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 MediumOfPerformancesController do
160
160
  it "redirects to the medium_of_performances list" do
161
161
  medium_of_performance = MediumOfPerformance.create! valid_attributes
162
162
  delete :destroy, :id => medium_of_performance.id
163
- response.should redirect_to(medium_of_performances_url)
163
+ expect(response).to redirect_to(medium_of_performances_url)
164
164
  end
165
165
  end
166
166
 
@@ -19,7 +19,7 @@ describe OwnsController do
19
19
 
20
20
  it "assigns all owns as @owns" do
21
21
  get :index
22
- assigns(:owns).should eq(Own.page(1))
22
+ expect(assigns(:owns)).to eq(Own.page(1))
23
23
  end
24
24
  end
25
25
 
@@ -28,7 +28,7 @@ describe OwnsController do
28
28
 
29
29
  it "assigns all owns as @owns" do
30
30
  get :index
31
- assigns(:owns).should eq(Own.page(1))
31
+ expect(assigns(:owns)).to eq(Own.page(1))
32
32
  end
33
33
  end
34
34
 
@@ -37,14 +37,14 @@ describe OwnsController do
37
37
 
38
38
  it "assigns all owns as @owns" do
39
39
  get :index
40
- assigns(:owns).should eq(Own.page(1))
40
+ expect(assigns(:owns)).to eq(Own.page(1))
41
41
  end
42
42
  end
43
43
 
44
44
  describe "When not logged in" do
45
45
  it "assigns all owns as @owns" do
46
46
  get :index
47
- assigns(:owns).should eq(Own.page(1))
47
+ expect(assigns(:owns)).to eq(Own.page(1))
48
48
  end
49
49
  end
50
50
  end
@@ -56,7 +56,7 @@ describe OwnsController do
56
56
  it "assigns the requested own as @own" do
57
57
  own = FactoryGirl.create(:own)
58
58
  get :show, :id => own.id
59
- assigns(:own).should eq(own)
59
+ expect(assigns(:own)).to eq(own)
60
60
  end
61
61
  end
62
62
 
@@ -66,7 +66,7 @@ describe OwnsController do
66
66
  it "assigns the requested own as @own" do
67
67
  own = FactoryGirl.create(:own)
68
68
  get :show, :id => own.id
69
- assigns(:own).should eq(own)
69
+ expect(assigns(:own)).to eq(own)
70
70
  end
71
71
  end
72
72
 
@@ -76,7 +76,7 @@ describe OwnsController do
76
76
  it "assigns the requested own as @own" do
77
77
  own = FactoryGirl.create(:own)
78
78
  get :show, :id => own.id
79
- assigns(:own).should eq(own)
79
+ expect(assigns(:own)).to eq(own)
80
80
  end
81
81
  end
82
82
 
@@ -84,7 +84,7 @@ describe OwnsController do
84
84
  it "assigns the requested own as @own" do
85
85
  own = FactoryGirl.create(:own)
86
86
  get :show, :id => own.id
87
- assigns(:own).should eq(own)
87
+ expect(assigns(:own)).to eq(own)
88
88
  end
89
89
  end
90
90
  end
@@ -95,8 +95,8 @@ describe OwnsController do
95
95
 
96
96
  it "assigns the requested own as @own" do
97
97
  get :new
98
- assigns(:own).should_not be_valid
99
- response.should be_success
98
+ expect(assigns(:own)).not_to be_valid
99
+ expect(response).to be_success
100
100
  end
101
101
  end
102
102
 
@@ -105,8 +105,8 @@ describe OwnsController do
105
105
 
106
106
  it "assigns the requested own as @own" do
107
107
  get :new
108
- assigns(:own).should_not be_valid
109
- response.should be_success
108
+ expect(assigns(:own)).not_to be_valid
109
+ expect(response).to be_success
110
110
  end
111
111
  end
112
112
 
@@ -115,16 +115,16 @@ describe OwnsController do
115
115
 
116
116
  it "should not assign the requested own as @own" do
117
117
  get :new
118
- assigns(:own).should_not be_valid
119
- response.should be_forbidden
118
+ expect(assigns(:own)).not_to be_valid
119
+ expect(response).to be_forbidden
120
120
  end
121
121
  end
122
122
 
123
123
  describe "When not logged in" do
124
124
  it "should not assign the requested own as @own" do
125
125
  get :new
126
- assigns(:own).should_not be_valid
127
- response.should redirect_to(new_user_session_url)
126
+ expect(assigns(:own)).not_to be_valid
127
+ expect(response).to redirect_to(new_user_session_url)
128
128
  end
129
129
  end
130
130
  end
@@ -136,7 +136,7 @@ describe OwnsController do
136
136
  it "assigns the requested own as @own" do
137
137
  own = FactoryGirl.create(:own)
138
138
  get :edit, :id => own.id
139
- assigns(:own).should eq(own)
139
+ expect(assigns(:own)).to eq(own)
140
140
  end
141
141
  end
142
142
 
@@ -146,7 +146,7 @@ describe OwnsController do
146
146
  it "assigns the requested own as @own" do
147
147
  own = FactoryGirl.create(:own)
148
148
  get :edit, :id => own.id
149
- assigns(:own).should eq(own)
149
+ expect(assigns(:own)).to eq(own)
150
150
  end
151
151
  end
152
152
 
@@ -156,7 +156,7 @@ describe OwnsController do
156
156
  it "assigns the requested own as @own" do
157
157
  own = FactoryGirl.create(:own)
158
158
  get :edit, :id => own.id
159
- response.should be_forbidden
159
+ expect(response).to be_forbidden
160
160
  end
161
161
  end
162
162
 
@@ -164,7 +164,7 @@ describe OwnsController do
164
164
  it "should not assign the requested own as @own" do
165
165
  own = FactoryGirl.create(:own)
166
166
  get :edit, :id => own.id
167
- response.should redirect_to(new_user_session_url)
167
+ expect(response).to redirect_to(new_user_session_url)
168
168
  end
169
169
  end
170
170
  end
@@ -181,24 +181,24 @@ describe OwnsController do
181
181
  describe "with valid params" do
182
182
  it "assigns a newly created own as @own" do
183
183
  post :create, :own => @attrs
184
- assigns(:own).should be_valid
184
+ expect(assigns(:own)).to be_valid
185
185
  end
186
186
 
187
187
  it "redirects to the created agent" do
188
188
  post :create, :own => @attrs
189
- response.should redirect_to(assigns(:own))
189
+ expect(response).to redirect_to(assigns(:own))
190
190
  end
191
191
  end
192
192
 
193
193
  describe "with invalid params" do
194
194
  it "assigns a newly created but unsaved own as @own" do
195
195
  post :create, :own => @invalid_attrs
196
- assigns(:own).should_not be_valid
196
+ expect(assigns(:own)).not_to be_valid
197
197
  end
198
198
 
199
199
  it "re-renders the 'new' template" do
200
200
  post :create, :own => @invalid_attrs
201
- response.should render_template("new")
201
+ expect(response).to render_template("new")
202
202
  end
203
203
  end
204
204
  end
@@ -209,24 +209,24 @@ describe OwnsController do
209
209
  describe "with valid params" do
210
210
  it "assigns a newly created own as @own" do
211
211
  post :create, :own => @attrs
212
- assigns(:own).should be_valid
212
+ expect(assigns(:own)).to be_valid
213
213
  end
214
214
 
215
215
  it "redirects to the created agent" do
216
216
  post :create, :own => @attrs
217
- response.should redirect_to(assigns(:own))
217
+ expect(response).to redirect_to(assigns(:own))
218
218
  end
219
219
  end
220
220
 
221
221
  describe "with invalid params" do
222
222
  it "assigns a newly created but unsaved own as @own" do
223
223
  post :create, :own => @invalid_attrs
224
- assigns(:own).should_not be_valid
224
+ expect(assigns(:own)).not_to be_valid
225
225
  end
226
226
 
227
227
  it "re-renders the 'new' template" do
228
228
  post :create, :own => @invalid_attrs
229
- response.should render_template("new")
229
+ expect(response).to render_template("new")
230
230
  end
231
231
  end
232
232
  end
@@ -237,24 +237,24 @@ describe OwnsController do
237
237
  describe "with valid params" do
238
238
  it "assigns a newly created own as @own" do
239
239
  post :create, :own => @attrs
240
- assigns(:own).should be_valid
240
+ expect(assigns(:own)).to be_valid
241
241
  end
242
242
 
243
243
  it "should be forbidden" do
244
244
  post :create, :own => @attrs
245
- response.should be_forbidden
245
+ expect(response).to be_forbidden
246
246
  end
247
247
  end
248
248
 
249
249
  describe "with invalid params" do
250
250
  it "assigns a newly created but unsaved own as @own" do
251
251
  post :create, :own => @invalid_attrs
252
- assigns(:own).should_not be_valid
252
+ expect(assigns(:own)).not_to be_valid
253
253
  end
254
254
 
255
255
  it "should be forbidden" do
256
256
  post :create, :own => @invalid_attrs
257
- response.should be_forbidden
257
+ expect(response).to be_forbidden
258
258
  end
259
259
  end
260
260
  end
@@ -263,24 +263,24 @@ describe OwnsController do
263
263
  describe "with valid params" do
264
264
  it "assigns a newly created own as @own" do
265
265
  post :create, :own => @attrs
266
- assigns(:own).should be_valid
266
+ expect(assigns(:own)).to be_valid
267
267
  end
268
268
 
269
269
  it "should be forbidden" do
270
270
  post :create, :own => @attrs
271
- response.should redirect_to(new_user_session_url)
271
+ expect(response).to redirect_to(new_user_session_url)
272
272
  end
273
273
  end
274
274
 
275
275
  describe "with invalid params" do
276
276
  it "assigns a newly created but unsaved own as @own" do
277
277
  post :create, :own => @invalid_attrs
278
- assigns(:own).should_not be_valid
278
+ expect(assigns(:own)).not_to be_valid
279
279
  end
280
280
 
281
281
  it "should be forbidden" do
282
282
  post :create, :own => @invalid_attrs
283
- response.should redirect_to(new_user_session_url)
283
+ expect(response).to redirect_to(new_user_session_url)
284
284
  end
285
285
  end
286
286
  end
@@ -303,20 +303,20 @@ describe OwnsController do
303
303
 
304
304
  it "assigns the requested own as @own" do
305
305
  put :update, :id => @own.id, :own => @attrs
306
- assigns(:own).should eq(@own)
307
- response.should redirect_to(@own)
306
+ expect(assigns(:own)).to eq(@own)
307
+ expect(response).to redirect_to(@own)
308
308
  end
309
309
 
310
310
  it "moves its position when specified" do
311
311
  put :update, :id => @own.id, :own => @attrs, :item_id => @own.item.id, :move => 'lower'
312
- response.should redirect_to(owns_url(item_id: @own.item_id))
312
+ expect(response).to redirect_to(owns_url(item_id: @own.item_id))
313
313
  end
314
314
  end
315
315
 
316
316
  describe "with invalid params" do
317
317
  it "assigns the requested own as @own" do
318
318
  put :update, :id => @own.id, :own => @invalid_attrs
319
- response.should render_template("edit")
319
+ expect(response).to render_template("edit")
320
320
  end
321
321
  end
322
322
  end
@@ -331,15 +331,15 @@ describe OwnsController do
331
331
 
332
332
  it "assigns the requested own as @own" do
333
333
  put :update, :id => @own.id, :own => @attrs
334
- assigns(:own).should eq(@own)
335
- response.should redirect_to(@own)
334
+ expect(assigns(:own)).to eq(@own)
335
+ expect(response).to redirect_to(@own)
336
336
  end
337
337
  end
338
338
 
339
339
  describe "with invalid params" do
340
340
  it "assigns the requested own as @own" do
341
341
  put :update, :id => @own.id, :own => @invalid_attrs
342
- response.should render_template("edit")
342
+ expect(response).to render_template("edit")
343
343
  end
344
344
  end
345
345
  end
@@ -354,15 +354,15 @@ describe OwnsController do
354
354
 
355
355
  it "assigns the requested own as @own" do
356
356
  put :update, :id => @own.id, :own => @attrs
357
- assigns(:own).should eq(@own)
358
- response.should be_forbidden
357
+ expect(assigns(:own)).to eq(@own)
358
+ expect(response).to be_forbidden
359
359
  end
360
360
  end
361
361
 
362
362
  describe "with invalid params" do
363
363
  it "assigns the requested own as @own" do
364
364
  put :update, :id => @own.id, :own => @invalid_attrs
365
- response.should be_forbidden
365
+ expect(response).to be_forbidden
366
366
  end
367
367
  end
368
368
  end
@@ -375,14 +375,14 @@ describe OwnsController do
375
375
 
376
376
  it "should be forbidden" do
377
377
  put :update, :id => @own.id, :own => @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
 
382
382
  describe "with invalid params" do
383
383
  it "assigns the requested own as @own" do
384
384
  put :update, :id => @own.id, :own => @invalid_attrs
385
- response.should redirect_to(new_user_session_url)
385
+ expect(response).to redirect_to(new_user_session_url)
386
386
  end
387
387
  end
388
388
  end
@@ -402,7 +402,7 @@ describe OwnsController do
402
402
 
403
403
  it "redirects to the owns list" do
404
404
  delete :destroy, :id => @own.id
405
- response.should redirect_to(owns_url)
405
+ expect(response).to redirect_to(owns_url)
406
406
  end
407
407
  end
408
408
 
@@ -415,7 +415,7 @@ describe OwnsController do
415
415
 
416
416
  it "redirects to the owns list" do
417
417
  delete :destroy, :id => @own.id
418
- response.should redirect_to(owns_url)
418
+ expect(response).to redirect_to(owns_url)
419
419
  end
420
420
  end
421
421
 
@@ -428,7 +428,7 @@ describe OwnsController do
428
428
 
429
429
  it "should be forbidden" do
430
430
  delete :destroy, :id => @own.id
431
- response.should be_forbidden
431
+ expect(response).to be_forbidden
432
432
  end
433
433
  end
434
434
 
@@ -439,7 +439,7 @@ describe OwnsController do
439
439
 
440
440
  it "should be forbidden" do
441
441
  delete :destroy, :id => @own.id
442
- response.should redirect_to(new_user_session_url)
442
+ expect(response).to redirect_to(new_user_session_url)
443
443
  end
444
444
  end
445
445
  end