RubyGems - enju_inventory - Versions diffs - 0.3.1 → 0.4.0.rc.1 - Mend

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :profile, class: Profile do |f|
+    f.user_group_id {UserGroup.first.id}
+    f.required_role_id {Role.where(name: 'User').first.id}
+    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.library_id { Library.find_by(name: 'kamata').id }
+    f.locale { "ja" }
+  end
+end

data/spec/factories/user.rb CHANGED

@@ -1,43 +1,37 @@
 FactoryBot.define do
-  factory :admin, class: User do |f|
-    f.sequence(:username){|n| "admin_#{n}"}
-    f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.password { 'adminpassword' }
-    f.password_confirmation { 'adminpassword' }
-    f.after(:create) do |user|
-      user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Administrator').id})
-      user_has_role.save
-      user.reload
+  factory :admin, class: User do
+    sequence(:username){|n| "admin_#{n}"}
+    sequence(:email){|n| "admin_#{n}@example.jp"}
+    password { 'adminpassword' }
+    password_confirmation { 'adminpassword' }
+    association :profile
+    after(:create) do |user|
+      user.role = Role.find_by(name: 'Administrator')
     end
   end
-  factory :librarian, class: User do |f|
-    f.sequence(:username){|n| "librarian_#{n}"}
-    f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.password { 'librarianpassword' }
-    f.password_confirmation { 'librarianpassword' }
-    f.after(:create) do |user|
-      user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Librarian').id})
-      user_has_role.save
-      user.reload
+  factory :librarian, class: User do
+    sequence(:username){|n| "librarian_#{n}"}
+    sequence(:email){|n| "librarian_#{n}@example.jp"}
+    password { 'librarianpassword' }
+    password_confirmation { 'librarianpassword' }
+    association :profile
+    after(:create) do |user|
+      user.role = Role.find_by(name: 'Librarian')
     end
   end
-  factory :user, class: User do |f|
-    f.sequence(:username){|n| "user_#{n}"}
-    f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.password { 'userpassword' }
-    f.password_confirmation { 'userpassword' }
-    f.after(:create) do |user|
-      user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'User').id})
-      user_has_role.save
-      user.reload
+  factory :user, class: User do
+    sequence(:username){|n| "user_#{n}"}
+    sequence(:email){|n| "user_#{n}@example.jp"}
+    password { 'userpassword' }
+    password_confirmation { 'userpassword' }
+    association :profile
+    after(:create) do |user|
+      user.role = Role.find_by(name: 'User')
     end
   end
-  factory :invalid_user, class: User do |f|
+  factory :invalid_user, class: User do
   end
 end

data/spec/fixtures/carrier_types.yml CHANGED

@@ -1,7 +1,7 @@
 ---
 carrier_type_00001:
   name: volume
-  display_name: Volume
+  display_name_translations: {"en": "Volume", "ja": "Volume"}
   updated_at: 2007-11-20 16:04:29.853828 +09:00
   id: 1
   note: !binary |
@@ -11,7 +11,7 @@ carrier_type_00001:
   position: 1
 carrier_type_00002:
   name: audio_disc
-  display_name: Audio disc
+  display_name_translations: {"en": "Audio disc", "ja": "Audio disc"}
   updated_at: 2007-12-19 01:45:26.040674 +09:00
   id: 2
   note: "\xE9\x9F\xB3\xE6\xA5\xBDCD\xE3\x81\xA7\xE3\x81\x99\xE3\x80\x82"
@@ -19,7 +19,7 @@ carrier_type_00002:
   position: 2
 carrier_type_00003:
   name: videodisc
-  display_name: Video disc
+  display_name_translations: {"en": "Video disc", "ja": "Video disc"}
   updated_at: 2007-12-23 04:24:23.151410 +09:00
   id: 3
   note: "DVD\xE3\x81\xA7\xE3\x81\x99\xE3\x80\x82"
@@ -27,7 +27,7 @@ carrier_type_00003:
   position: 3
 carrier_type_00004:
   name: online_resource
-  display_name: online_resource
+  display_name_translations: {"en": "online_resource", "ja": "online_resource"}
   updated_at: 2007-12-24 01:30:50.637433 +09:00
   id: 4
   note: !binary |
@@ -40,15 +40,12 @@ carrier_type_00004:
 #
 # Table name: carrier_types
 #
-#  id                      :integer          not null, primary key
-#  name                    :string           not null
-#  display_name            :text
-#  note                    :text
-#  position                :integer
-#  created_at              :datetime
-#  updated_at              :datetime
-#  attachment_file_name    :string
-#  attachment_content_type :string
-#  attachment_file_size    :integer
-#  attachment_updated_at   :datetime
+#  id                        :bigint           not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  display_name_translations :jsonb            not null
 #

data/spec/fixtures/circulation_statuses.yml CHANGED

@@ -1,106 +1,97 @@
 ---
 circulation_status_00001:
   name: Available For Pickup
-  display_name: "en: Available For Pickup\r\n\
-    ja: 持ち出し可能"
+  display_name_translations: {"en": "Available For Pickup", "ja": "持ち出し可能"}
   id: 1
   note: ""
   position: 1
 circulation_status_00002:
   name: Available On Shelf
-  display_name: "en: Available On Shelf\r\n\
-    ja: 在架（利用可能）"
+  display_name_translations: {"en": "Available On Shelf", "ja": "在架（利用可能）"}
   id: 2
   note: ""
   position: 2
 circulation_status_00003:
   name: Circulation Status Undefined
-  display_name: Circulation Status Undefined
+  display_name_translations: {"en": "Circulation Status Undefined", "ja": "Circulation Status Undefined"}
   id: 3
   note: ""
   position: 3
 circulation_status_00004:
   name: Claimed Returned Or Never Borrowed
-  display_name: Claimed Returned Or Never Borrowed
+  display_name_translations: {"en": "Claimed Returned Or Never Borrowed", "ja": "Claimed Returned Or Never Borrowed"}
   id: 4
   note: ""
   position: 4
 circulation_status_00005:
   name: In Process
-  display_name: "en: In Process\r\n\
-    ja: 作業中"
+  display_name_translations: {"en": "In Process", "ja": "作業中"}
   id: 5
   note: ""
   position: 5
 circulation_status_00006:
   name: In Transit Between Library Locations
-  display_name: In Transit Between Library Locations
+  display_name_translations: {"en": "In Transit Between Library Locations", "ja": "In Transit Between Library Locations"}
   id: 6
   note: ""
   position: 6
 circulation_status_00007:
   name: Lost
-  display_name: "en: Lost\r\n\
-    ja: 紛失"
+  display_name_translations: {"en": "Lost", "ja": "紛失"}
   id: 7
   note: ""
   position: 7
 circulation_status_00008:
   name: Missing
-  display_name: "en: Missing\r\n\
-    ja: 行方不明"
+  display_name_translations: {"en": "Missing", "ja": "行方不明"}
   id: 8
   note: ""
   position: 8
 circulation_status_00009:
   name: Not Available
-  display_name: "en: Not Available\r\n\
-    ja: 利用不可"
+  display_name_translations: {"en": "Not Available", "ja": "利用不可"}
   id: 9
   note: ""
   position: 9
 circulation_status_00010:
   name: On Loan
-  display_name: "en: On Loan\r\n\
-    ja: 貸出中"
+  display_name_translations: {"en": "On Loan", "ja": "貸出中"}
   id: 10
   note: ""
   position: 10
 circulation_status_00011:
   name: On Order
-  display_name: On Order
+  display_name_translations: {"en": "On Order", "ja": "On Order"}
   id: 11
   note: ""
   position: 11
 circulation_status_00012:
   name: Pending Transfer
-  display_name: Pending Transfer
+  display_name_translations: {"en": "Pending Transfer", "ja": "Pending Transfer"}
   id: 12
   note: ""
   position: 12
 circulation_status_00013:
-  name: Recalled
-  display_name: Recalled
+  name: Recalled
+  display_name_translations: {"en": "Recalled", "ja": "Recalled"}
   id: 13
   note: ""
   position: 13
 circulation_status_00014:
-  name: Waiting To Be Reshelved
-  display_name: Waiting To Be Reshelved
+  name: Waiting To Be Reshelved
+  display_name_translations: {"en": "Waiting To Be Reshelved", "ja": "Waiting To Be Reshelved"}
   id: 14
   note: ""
   position: 14
 circulation_status_00015:
   name: Not arrived
-  display_name: "en: Not arrived\r\n\
-    ja: 未着"
+  display_name_translations: {"en": "Not arrived", "ja": "未着"}
   id: 15
   note: ""
   position: 15
 circulation_status_00016:
   name: Removed
-  display_name: "en: Removed\r\n\
-    ja: 除籍済み"
+  display_name_translations: {"en": "Removed", "ja": "除籍済み"}
   id: 16
   note: ""
   position: 16
@@ -109,11 +100,12 @@ circulation_status_00016:
 #
 # Table name: circulation_statuses
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :bigint           not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  display_name_translations :jsonb            not null
 #