enju_event 0.1.17.pre18 → 0.1.17.pre19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (234) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/event_export_files_controller.rb +100 -0
  3. data/app/controllers/event_import_files_controller.rb +21 -12
  4. data/app/controllers/event_import_results_controller.rb +1 -1
  5. data/app/controllers/events_controller.rb +16 -16
  6. data/app/controllers/participates_controller.rb +8 -8
  7. data/app/models/enju_event/ability.rb +2 -0
  8. data/app/models/event.rb +36 -15
  9. data/app/models/event_category.rb +1 -1
  10. data/app/models/event_export_file.rb +51 -0
  11. data/app/models/event_export_file_state_machine.rb +15 -0
  12. data/app/models/event_export_file_transition.rb +20 -0
  13. data/app/models/event_import_file.rb +44 -45
  14. data/app/models/event_import_result.rb +2 -2
  15. data/app/models/participate.rb +2 -2
  16. data/app/views/calendar/index.html.erb +6 -6
  17. data/app/views/event_categories/edit.html.erb +1 -1
  18. data/app/views/event_categories/index.html.erb +3 -3
  19. data/app/views/event_categories/new.html.erb +1 -1
  20. data/app/views/event_categories/show.html.erb +1 -1
  21. data/app/views/event_export_files/_form.html.erb +22 -0
  22. data/app/views/event_export_files/edit.html.erb +6 -0
  23. data/app/views/event_export_files/index.html.erb +44 -0
  24. data/app/views/event_export_files/new.html.erb +16 -0
  25. data/app/views/event_export_files/show.html.erb +31 -0
  26. data/app/views/event_import_files/edit.html.erb +1 -1
  27. data/app/views/event_import_files/index.html.erb +30 -25
  28. data/app/views/event_import_files/new.html.erb +24 -12
  29. data/app/views/event_import_files/show.html.erb +14 -4
  30. data/app/views/event_import_results/index.html.erb +6 -6
  31. data/app/views/event_import_results/{index.tsv.erb → index.txt.erb} +1 -1
  32. data/app/views/event_import_results/show.html.erb +1 -1
  33. data/app/views/events/_form.html.erb +6 -6
  34. data/app/views/events/edit.html.erb +2 -2
  35. data/app/views/events/index.atom.builder +2 -2
  36. data/app/views/events/index.html.erb +22 -22
  37. data/app/views/events/index.mobile.erb +11 -11
  38. data/app/views/events/index.rss.builder +5 -5
  39. data/app/views/events/index.txt.erb +4 -0
  40. data/app/views/events/new.html.erb +1 -1
  41. data/app/views/events/show.html.erb +5 -5
  42. data/app/views/events/show.mobile.erb +4 -4
  43. data/app/views/layouts/calendar.html.erb +3 -3
  44. data/app/views/participates/edit.html.erb +1 -1
  45. data/app/views/participates/index.html.erb +3 -3
  46. data/app/views/participates/new.html.erb +1 -1
  47. data/app/views/participates/show.html.erb +1 -1
  48. data/app/workers/event_export_file_queue.rb +7 -0
  49. data/config/locales/translation_en.yml +10 -0
  50. data/config/locales/translation_ja.yml +11 -1
  51. data/config/routes.rb +4 -3
  52. data/db/migrate/113_create_events.rb +2 -2
  53. data/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +5 -0
  54. data/db/migrate/20140812152348_create_event_export_files.rb +11 -0
  55. data/db/migrate/20140812153137_create_event_export_file_transitions.rb +14 -0
  56. data/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb +5 -0
  57. data/lib/enju_event/version.rb +1 -1
  58. data/spec/controllers/calendar_controller_spec.rb +2 -2
  59. data/spec/controllers/event_categories_controller_spec.rb +21 -21
  60. data/spec/controllers/event_export_files_controller_spec.rb +286 -0
  61. data/spec/controllers/event_import_files_controller_spec.rb +20 -60
  62. data/spec/controllers/event_import_results_controller_spec.rb +6 -18
  63. data/spec/controllers/events_controller_spec.rb +21 -63
  64. data/spec/controllers/participates_controller_spec.rb +21 -21
  65. data/spec/dummy/app/helpers/application_helper.rb +1 -0
  66. data/spec/dummy/app/models/user.rb +2 -84
  67. data/spec/dummy/config/environments/test.rb +6 -6
  68. data/spec/dummy/db/development.sqlite3 +0 -0
  69. data/spec/dummy/db/migrate/001_create_agents.rb +0 -1
  70. data/spec/dummy/db/migrate/{20111201155456_devise_create_users.rb → 002_devise_create_users.rb} +6 -2
  71. data/spec/dummy/db/migrate/005_create_manifestations.rb +7 -7
  72. data/spec/dummy/db/migrate/006_create_items.rb +0 -3
  73. data/spec/dummy/db/migrate/041_create_roles.rb +13 -0
  74. data/spec/dummy/db/migrate/080_create_library_groups.rb +0 -1
  75. data/spec/dummy/db/migrate/154_create_messages.rb +0 -1
  76. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +0 -2
  77. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +0 -2
  78. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -3
  79. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +0 -1
  80. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +0 -1
  81. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +0 -1
  82. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +0 -1
  83. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +0 -4
  84. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +0 -1
  85. data/spec/dummy/db/migrate/{20111201163718_create_user_has_roles.rb → 20100606065209_create_user_has_roles.rb} +2 -0
  86. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +9 -0
  87. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +12 -0
  88. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +5 -0
  89. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +0 -10
  90. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +18 -0
  91. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +11 -0
  92. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +20 -0
  93. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +14 -0
  94. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +14 -0
  95. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +14 -0
  96. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +14 -0
  97. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +14 -0
  98. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +14 -0
  99. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +14 -0
  100. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +14 -0
  101. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +14 -0
  102. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +14 -0
  103. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +11 -0
  104. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +14 -0
  105. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +5 -0
  106. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +5 -0
  107. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +5 -0
  108. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +11 -0
  109. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +14 -0
  110. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +8 -0
  111. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +5 -0
  112. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +5 -0
  113. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +5 -0
  114. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +6 -0
  115. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_stat.rb +12 -0
  116. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
  117. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
  118. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +5 -0
  119. data/spec/dummy/db/schema.rb +290 -165
  120. data/spec/dummy/db/test.sqlite3 +0 -0
  121. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import51.txt +3 -0
  122. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv +1 -1
  123. data/spec/dummy/solr/default/data/index/_1dz.fdt +0 -0
  124. data/spec/dummy/solr/default/data/index/{_b2.si → _1dz.si} +0 -0
  125. data/spec/dummy/solr/default/data/index/{_b2_Lucene41_0.tim → _1dz_Lucene41_0.tim} +0 -0
  126. data/spec/dummy/solr/default/data/index/_1e0.fdt +0 -0
  127. data/spec/dummy/solr/default/data/index/{_b3.fnm → _1e0.fnm} +0 -0
  128. data/spec/dummy/solr/default/data/index/{_b3.si → _1e0.si} +0 -0
  129. data/spec/dummy/solr/default/data/index/_1e0_Lucene41_0.pos +0 -0
  130. data/spec/dummy/solr/default/data/index/_1e0_Lucene41_0.tim +0 -0
  131. data/spec/dummy/solr/default/data/index/_1e0_Lucene41_0.tip +0 -0
  132. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  133. data/spec/dummy/solr/default/data/index/segments_1yj +0 -0
  134. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002528 +0 -0
  135. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002529 +0 -0
  136. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000632 → tlog.0000000000000002530} +0 -0
  137. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002531 +0 -0
  138. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002532 +0 -0
  139. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000635 → tlog.0000000000000002533} +0 -0
  140. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002534 +0 -0
  141. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002535 +0 -0
  142. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000638 → tlog.0000000000000002536} +0 -0
  143. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002537 +0 -0
  144. data/spec/dummy/solr/test/data/index/_a.fdt +0 -0
  145. data/spec/dummy/solr/test/data/index/_a.fdx +0 -0
  146. data/spec/dummy/solr/test/data/index/_a.fnm +0 -0
  147. data/spec/dummy/solr/test/data/index/_a.nvd +0 -0
  148. data/spec/dummy/solr/test/data/index/_a.nvm +0 -0
  149. data/spec/dummy/solr/test/data/index/_a.si +0 -0
  150. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.doc +0 -0
  151. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.pos +0 -0
  152. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.tim +0 -0
  153. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.tip +0 -0
  154. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  155. data/spec/dummy/solr/test/data/index/segments_n +0 -0
  156. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000013 +0 -0
  157. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000014 +0 -0
  158. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000015 +0 -0
  159. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000016 +0 -0
  160. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000017 +0 -0
  161. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000018 +0 -0
  162. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000019 +0 -0
  163. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000020 +0 -0
  164. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000021 +0 -0
  165. data/spec/dummy/tmp/cache/stdout +27 -0
  166. data/spec/dummy/tmp/pids/redis-test.pid +1 -0
  167. data/spec/factories/event.rb +2 -0
  168. data/spec/factories/profile.rb +10 -0
  169. data/spec/factories/user.rb +21 -9
  170. data/spec/fixtures/event_categories.yml +8 -8
  171. data/spec/fixtures/event_export_files.yml +26 -0
  172. data/spec/fixtures/event_import_files.yml +2 -1
  173. data/spec/fixtures/events.yml +2 -3
  174. data/spec/fixtures/library_groups.yml +0 -2
  175. data/spec/fixtures/message_templates.yml +105 -0
  176. data/spec/fixtures/profiles.yml +98 -0
  177. data/spec/fixtures/user_groups.yml +3 -3
  178. data/spec/fixtures/users.yml +3 -21
  179. data/spec/models/event_export_file_spec.rb +31 -0
  180. data/spec/models/event_import_file_spec.rb +37 -11
  181. data/spec/models/event_spec.rb +2 -3
  182. data/spec/support/resque.rb +1 -0
  183. data/spec/views/event_export_files/edit.html.erb_spec.rb +16 -0
  184. data/spec/views/event_export_files/index.html.erb_spec.rb +17 -0
  185. data/spec/views/event_export_files/new.html.erb_spec.rb +16 -0
  186. data/spec/views/event_export_files/show.html.erb_spec.rb +13 -0
  187. metadata +222 -118
  188. data/app/views/events/index.csv.erb +0 -4
  189. data/spec/dummy/app/mailers/notifier.rb +0 -28
  190. data/spec/dummy/db/migrate/029_create_subjects.rb +0 -27
  191. data/spec/dummy/db/migrate/142_create_classifications.rb +0 -19
  192. data/spec/dummy/db/migrate/143_create_subject_has_classifications.rb +0 -16
  193. data/spec/dummy/db/migrate/144_create_classification_types.rb +0 -16
  194. data/spec/dummy/db/migrate/145_create_subject_heading_types.rb +0 -16
  195. data/spec/dummy/db/migrate/146_create_subject_types.rb +0 -16
  196. data/spec/dummy/db/migrate/20080606052544_create_work_has_subjects.rb +0 -18
  197. data/spec/dummy/db/migrate/20090208044541_create_subject_heading_type_has_subjects.rb +0 -16
  198. data/spec/dummy/db/migrate/20110425133109_add_issn_to_series_statement.rb +0 -9
  199. data/spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb +0 -9
  200. data/spec/dummy/db/migrate/20110820131417_create_series_has_manifestations.rb +0 -13
  201. data/spec/dummy/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb +0 -11
  202. data/spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb +0 -13
  203. data/spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb +0 -9
  204. data/spec/dummy/db/migrate/20111201121844_create_roles.rb +0 -12
  205. data/spec/dummy/db/migrate/20120406020752_add_url_to_subject.rb +0 -5
  206. data/spec/dummy/db/migrate/20120415060308_rename_resource_import_file_imported_at_to_executed_at.rb +0 -9
  207. data/spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb +0 -6
  208. data/spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb +0 -6
  209. data/spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb +0 -5
  210. data/spec/dummy/solr/default/data/index/_b2.fdt +0 -0
  211. data/spec/dummy/solr/default/data/index/_b3.fdt +0 -0
  212. data/spec/dummy/solr/default/data/index/_b3_Lucene41_0.pos +0 -0
  213. data/spec/dummy/solr/default/data/index/_b3_Lucene41_0.tim +0 -0
  214. data/spec/dummy/solr/default/data/index/_b3_Lucene41_0.tip +0 -0
  215. data/spec/dummy/solr/default/data/index/segments_ht +0 -0
  216. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000630 +0 -0
  217. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000631 +0 -0
  218. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000633 +0 -0
  219. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000634 +0 -0
  220. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000636 +0 -0
  221. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000637 +0 -0
  222. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000639 +0 -0
  223. data/spec/dummy/solr/test/data/index/segments_1 +0 -0
  224. /data/spec/dummy/solr/default/data/index/{_b2.fdx → _1dz.fdx} +0 -0
  225. /data/spec/dummy/solr/default/data/index/{_b2.fnm → _1dz.fnm} +0 -0
  226. /data/spec/dummy/solr/default/data/index/{_b2.nvd → _1dz.nvd} +0 -0
  227. /data/spec/dummy/solr/default/data/index/{_b2.nvm → _1dz.nvm} +0 -0
  228. /data/spec/dummy/solr/default/data/index/{_b2_Lucene41_0.doc → _1dz_Lucene41_0.doc} +0 -0
  229. /data/spec/dummy/solr/default/data/index/{_b2_Lucene41_0.pos → _1dz_Lucene41_0.pos} +0 -0
  230. /data/spec/dummy/solr/default/data/index/{_b2_Lucene41_0.tip → _1dz_Lucene41_0.tip} +0 -0
  231. /data/spec/dummy/solr/default/data/index/{_b3.fdx → _1e0.fdx} +0 -0
  232. /data/spec/dummy/solr/default/data/index/{_b3.nvd → _1e0.nvd} +0 -0
  233. /data/spec/dummy/solr/default/data/index/{_b3.nvm → _1e0.nvm} +0 -0
  234. /data/spec/dummy/solr/default/data/index/{_b3_Lucene41_0.doc → _1e0_Lucene41_0.doc} +0 -0
@@ -2,42 +2,67 @@
2
2
  require 'spec_helper'
3
3
 
4
4
  describe EventImportFile do
5
- fixtures :users
5
+ fixtures :all
6
6
  #pending "add some examples to (or delete) #{__FILE__}"
7
7
 
8
8
  describe "When it is written in utf-8" do
9
9
  before(:each) do
10
- @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample1.tsv")
10
+ @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample1.tsv"), :default_library_id => 3
11
+ @file.default_library = Library.find(3)
12
+ @file.default_event_category = EventCategory.find(3)
13
+ @file.user = users(:admin)
11
14
  end
12
15
 
13
16
  it "should be imported" do
14
17
  closing_days_size = Event.closing_days.size
15
18
  old_events_count = Event.count
16
19
  old_import_results_count = EventImportResult.count
17
- @file.import_start.should eq({:imported => 3, :failed => 1})
18
- Event.count.should eq old_events_count + 3
20
+ @file.import_start.should eq({:imported => 2, :failed => 2})
21
+ Event.count.should eq old_events_count + 2
19
22
  Event.closing_days.size.should eq closing_days_size + 1
20
23
  EventImportResult.count.should eq old_import_results_count + 5
24
+ Event.order(:id).last.library.name.should eq 'hachioji'
25
+ Event.order(:id).last.name.should eq 'event3'
26
+ Event.where(name: 'event2').first.should be_nil
27
+ event3 = Event.where(name: 'event3').first
28
+ event3.display_name.should eq 'イベント3'
29
+ event3.event_category.name.should eq 'book_talk'
30
+ event4 = Event.where(name: '休館日1').first
31
+ event4.event_category.name.should eq 'closed'
21
32
 
22
33
  @file.event_import_fingerprint.should be_truthy
23
34
  @file.executed_at.should be_truthy
35
+
36
+ @file.reload
37
+ @file.error_message.should eq "The follwing column(s) were ignored: invalid"
38
+ end
39
+
40
+ it "should send message when import is completed" do
41
+ old_message_count = Message.count
42
+ @file.user = User.where(username: 'librarian1').first
43
+ @file.import_start
44
+ Message.count.should eq old_message_count + 1
45
+ Message.order(:id).last.subject.should eq 'インポートが完了しました'
24
46
  end
25
47
  end
26
48
 
27
49
  describe "When it is written in shift_jis" do
28
50
  before(:each) do
29
51
  @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample2.tsv")
52
+ @file.default_library = Library.find(3)
53
+ @file.default_event_category = EventCategory.find(3)
54
+ @file.user = users(:admin)
30
55
  end
31
56
 
32
57
  it "should be imported" do
33
58
  old_event_count = Event.count
34
59
  old_import_results_count = EventImportResult.count
35
60
  @file.import_start
36
- Event.order('id DESC').first.name.should eq '日本語の催し物2'
61
+ Event.order('id DESC').first.name.should eq 'event3'
37
62
  Event.count.should eq old_event_count + 2
38
- EventImportResult.count.should eq old_import_results_count + 3
39
- Event.order('id DESC').first.start_at.should eq Time.zone.parse('2011-03-26').beginning_of_day
40
- Event.order('id DESC').first.end_at.to_s.should eq Time.zone.parse('2011-03-27').end_of_day.to_s
63
+ EventImportResult.count.should eq old_import_results_count + 5
64
+ Event.order('id DESC').first.start_at.should eq Time.zone.parse('2014-07-01').beginning_of_day
65
+ Event.order('id DESC').first.end_at.should eq Time.zone.parse('2014-07-31 14:00')
41
66
  end
42
67
  end
43
68
 
@@ -62,10 +87,10 @@ describe EventImportFile do
62
87
  event1 = Event.find(1)
63
88
  event1.name.should eq '変更後のイベント名'
64
89
  event1.start_at.should eq Time.zone.parse('2012-04-01').beginning_of_day
65
- event1.end_at.to_s.should eq Time.zone.parse('2012-04-02').end_of_day.to_s
90
+ event1.end_at.should eq Time.zone.parse('2012-04-02')
66
91
 
67
92
  event2 = Event.find(2)
68
- event2.end_at.to_s.should eq Time.zone.parse('2012-04-03').beginning_of_day.to_s
93
+ event2.end_at.should eq Time.zone.parse('2012-04-03')
69
94
  event2.all_day.should be_falsy
70
95
  event2.library.name.should eq 'mita'
71
96
 
@@ -113,5 +138,6 @@ end
113
138
  # event_import_fingerprint :string(255)
114
139
  # error_message :text
115
140
  # user_encoding :string(255)
141
+ # default_library_id :integer
142
+ # default_event_category_id :integer
116
143
  #
117
-
@@ -24,8 +24,8 @@ end
24
24
  # Table name: events
25
25
  #
26
26
  # id :integer not null, primary key
27
- # library_id :integer default(1), not null
28
- # event_category_id :integer default(1), not null
27
+ # library_id :integer not null
28
+ # event_category_id :integer not null
29
29
  # name :string(255)
30
30
  # note :text
31
31
  # start_at :datetime
@@ -36,4 +36,3 @@ end
36
36
  # created_at :datetime not null
37
37
  # updated_at :datetime not null
38
38
  #
39
-
@@ -4,6 +4,7 @@ RSpec.configure do |config|
4
4
  REDIS_CACHE_PATH = "#{Rails.root}/tmp/cache/"
5
5
 
6
6
  unless ENV["TRAVIS"]
7
+ Resque.redis = 'localhost:9736'
7
8
  config.before(:suite) do
8
9
  redis_options = {
9
10
  "daemonize" => 'yes',
@@ -0,0 +1,16 @@
1
+ require 'spec_helper'
2
+
3
+ describe "event_export_files/edit" do
4
+ before(:each) do
5
+ @event_export_file = assign(:event_export_file, stub_model(EventExportFile, user_id: 1))
6
+ view.stub(:current_user).and_return(User.find(1))
7
+ end
8
+
9
+ it "renders the edit event_export_file form" do
10
+ render
11
+
12
+ # Run the generator again with the --webrat flag if you want to use webrat matchers
13
+ assert_select "form[action=?][method=?]", event_export_file_path(@event_export_file), "post" do
14
+ end
15
+ end
16
+ end
@@ -0,0 +1,17 @@
1
+ require 'spec_helper'
2
+
3
+ describe "event_export_files/index" do
4
+ fixtures :all
5
+
6
+ before(:each) do
7
+ assign(:event_export_files, Kaminari::paginate_array([
8
+ stub_model(EventExportFile, user_id: 1),
9
+ stub_model(EventExportFile, user_id: 1)
10
+ ]).page(1))
11
+ end
12
+
13
+ it "renders a list of event_export_files" do
14
+ render
15
+ # Run the generator again with the --webrat flag if you want to use webrat matchers
16
+ end
17
+ end
@@ -0,0 +1,16 @@
1
+ require 'spec_helper'
2
+
3
+ describe "event_export_files/new" do
4
+ before(:each) do
5
+ assign(:event_export_file, stub_model(EventExportFile, user_id: 1).as_new_record)
6
+ view.stub(:current_user).and_return(User.find(1))
7
+ end
8
+
9
+ it "renders new event_export_file form" do
10
+ render
11
+
12
+ # Run the generator again with the --webrat flag if you want to use webrat matchers
13
+ assert_select "form[action=?][method=?]", event_export_files_path, "post" do
14
+ end
15
+ end
16
+ end
@@ -0,0 +1,13 @@
1
+ require 'spec_helper'
2
+
3
+ describe "event_export_files/show" do
4
+ before(:each) do
5
+ @event_export_file = assign(:event_export_file, stub_model(EventExportFile))
6
+ view.stub(:current_user).and_return(User.find(1))
7
+ end
8
+
9
+ it "renders attributes in <p>" do
10
+ render
11
+ # Run the generator again with the --webrat flag if you want to use webrat matchers
12
+ end
13
+ end