enju_purchase_request 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (66) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/order_list.rb +1 -1
  3. data/app/models/order_list_transition.rb +1 -1
  4. data/db/migrate/20180107155817_add_constraints_to_most_recent_for_order_list_transitions.rb +13 -0
  5. data/lib/enju_purchase_request/version.rb +1 -1
  6. data/lib/generators/enju_purchase_request/setup/setup_generator.rb +1 -0
  7. data/lib/generators/enju_purchase_request/update/update_generator.rb +8 -0
  8. data/spec/controllers/order_lists_controller_spec.rb +33 -33
  9. data/spec/controllers/orders_controller_spec.rb +34 -34
  10. data/spec/controllers/purchase_requests_controller_spec.rb +4 -4
  11. data/spec/dummy/db/migrate/005_create_manifestations.rb +0 -1
  12. data/spec/dummy/db/migrate/059_create_libraries.rb +7 -9
  13. data/spec/dummy/db/migrate/069_create_shelves.rb +3 -4
  14. data/spec/dummy/db/migrate/080_create_library_groups.rb +2 -3
  15. data/spec/dummy/db/migrate/120_create_baskets.rb +2 -3
  16. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +4 -7
  17. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +4 -5
  18. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +2 -2
  19. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +0 -1
  20. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +3 -6
  21. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
  22. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +2 -2
  23. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +5 -1
  24. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +5 -1
  25. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +5 -1
  26. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +1 -2
  27. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +5 -1
  28. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
  29. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +1 -1
  30. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
  31. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
  32. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -3
  33. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
  34. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
  35. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
  36. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
  37. data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +5 -0
  38. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +3 -5
  39. data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +6 -0
  40. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +19 -6
  41. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +15 -2
  42. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +9 -0
  43. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +9 -0
  44. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +9 -0
  45. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +9 -0
  46. data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +6 -0
  47. data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +11 -0
  48. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +5 -0
  49. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +5 -0
  50. data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +5 -0
  51. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +5 -0
  52. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +5 -0
  53. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +5 -0
  54. data/spec/dummy/db/schema.rb +42 -12
  55. data/spec/factories/bookstore.rb +1 -1
  56. data/spec/factories/library.rb +2 -2
  57. data/spec/factories/order.rb +3 -3
  58. data/spec/factories/order_list.rb +3 -3
  59. data/spec/factories/profile.rb +1 -1
  60. data/spec/factories/purchase_request.rb +2 -2
  61. data/spec/factories/user.rb +1 -1
  62. data/spec/fixtures/library_groups.yml +1 -1
  63. data/spec/fixtures/order_list_transitions.yml +1 -1
  64. data/spec/rails_helper.rb +3 -3
  65. data/spec/support/controller_macros.rb +3 -3
  66. metadata +222 -240
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1b1242c2f9b0e229e2d70f38d67f97b51c574203
4
- data.tar.gz: 4a91c0a18bdb3d469d71167852990590a3f11a55
3
+ metadata.gz: f15866e9a20e24c71efe5a00fff44acb23e6bf91
4
+ data.tar.gz: a0e97b4a23f5e37c9291793b4fd8a44ebd064996
5
5
  SHA512:
6
- metadata.gz: 042ef6886ef775fd04ae03b644315fc0272dd99be2962fbf93521d94ebb86cf7d8b6a99d6882d440572707453fe22067616661200372f966001caa33d328c0d6
7
- data.tar.gz: d0ba37661bcbcad59c37692b652868be31c9ebebef0b525b63b1ca22278b37325ba9283706a1cd71f2a724c873f28f154158bdf03c816c87e90f9cafab61a94c
6
+ metadata.gz: 62d55ab2f64163e57b9a6eda569904577079546df5718d57e1150455c3f44aed5992576a1f5e266db24fe49ed1316571c4d8ab5b6db61b448fa9312fed01164d
7
+ data.tar.gz: 9774a6a0853cb106cb13c69931d1cd2b667c3b5afa1ab97eeaddcb752a32a72003da4910758d06abc74b17133c89c0d7dfe55ee9439df814110ca708220ac1ae
@@ -23,7 +23,7 @@ class OrderList < ActiveRecord::Base
23
23
  OrderListStateMachine.new(self, transition_class: OrderListTransition)
24
24
  end
25
25
 
26
- has_many :order_list_transitions
26
+ has_many :order_list_transitions, autosave: false
27
27
 
28
28
  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
29
29
  to: :state_machine
@@ -16,5 +16,5 @@ end
16
16
  # order_list_id :integer
17
17
  # created_at :datetime
18
18
  # updated_at :datetime
19
- # most_recent :boolean
19
+ # most_recent :boolean not null
20
20
  #
@@ -0,0 +1,13 @@
1
+ class AddConstraintsToMostRecentForOrderListTransitions < ActiveRecord::Migration
2
+ disable_ddl_transaction!
3
+
4
+ def up
5
+ add_index :order_list_transitions, [:order_list_id, :most_recent], unique: true, where: "most_recent", name: "index_order_list_transitions_parent_most_recent" #, algorithm: :concurrently
6
+ change_column_null :order_list_transitions, :most_recent, false
7
+ end
8
+
9
+ def down
10
+ remove_index :order_list_transitions, name: "index_order_list_transitions_parent_most_recent"
11
+ change_column_null :order_list_transitions, :most_recent, true
12
+ end
13
+ end
@@ -1,3 +1,3 @@
1
1
  module EnjuPurchaseRequest
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.1"
3
3
  end
@@ -5,4 +5,5 @@ class EnjuPurchaseRequest::SetupGenerator < Rails::Generators::Base
5
5
  rake("enju_purchase_request_engine:install:migrations")
6
6
  inject_into_file 'app/models/user.rb',
7
7
  " enju_purchase_request_user_model\n", :after => "enju_leaf_user_model\n"
8
+ generate("enju_purchase_request:update")
8
9
  end
@@ -0,0 +1,8 @@
1
+ class EnjuPurchaseRequest::UpdateGenerator < Rails::Generators::Base
2
+ source_root File.expand_path('../templates', __FILE__)
3
+ desc "Create files for updating Next-L Enju"
4
+
5
+ def copy_statesman_migration_files
6
+ generate('statesman:add_constraints_to_most_recent', 'OrderList', 'OrderListTransition')
7
+ end
8
+ end
@@ -8,7 +8,7 @@ describe OrderListsController do
8
8
  describe "GET index" do
9
9
  describe "When logged in as Administrator" do
10
10
  before(:each) do
11
- sign_in FactoryGirl.create(:admin)
11
+ sign_in FactoryBot.create(:admin)
12
12
  end
13
13
 
14
14
  it "assigns all order_lists as @order_lists" do
@@ -19,7 +19,7 @@ describe OrderListsController do
19
19
 
20
20
  describe "When logged in as Librarian" do
21
21
  before(:each) do
22
- sign_in FactoryGirl.create(:librarian)
22
+ sign_in FactoryBot.create(:librarian)
23
23
  end
24
24
 
25
25
  it "assigns all order_lists as @order_lists" do
@@ -30,7 +30,7 @@ describe OrderListsController do
30
30
 
31
31
  describe "When logged in as User" do
32
32
  before(:each) do
33
- sign_in FactoryGirl.create(:user)
33
+ sign_in FactoryBot.create(:user)
34
34
  end
35
35
 
36
36
  it "assigns empty as @order_lists" do
@@ -50,11 +50,11 @@ describe OrderListsController do
50
50
  describe "GET show" do
51
51
  describe "When logged in as Administrator" do
52
52
  before(:each) do
53
- sign_in FactoryGirl.create(:admin)
53
+ sign_in FactoryBot.create(:admin)
54
54
  end
55
55
 
56
56
  it "assigns the requested order_list as @order_list" do
57
- order_list = FactoryGirl.create(:order_list)
57
+ order_list = FactoryBot.create(:order_list)
58
58
  get :show, :id => order_list.id
59
59
  assigns(:order_list).should eq(order_list)
60
60
  end
@@ -62,11 +62,11 @@ describe OrderListsController do
62
62
 
63
63
  describe "When logged in as Librarian" do
64
64
  before(:each) do
65
- sign_in FactoryGirl.create(:librarian)
65
+ sign_in FactoryBot.create(:librarian)
66
66
  end
67
67
 
68
68
  it "assigns the requested order_list as @order_list" do
69
- order_list = FactoryGirl.create(:order_list)
69
+ order_list = FactoryBot.create(:order_list)
70
70
  get :show, :id => order_list.id
71
71
  assigns(:order_list).should eq(order_list)
72
72
  end
@@ -74,11 +74,11 @@ describe OrderListsController do
74
74
 
75
75
  describe "When logged in as User" do
76
76
  before(:each) do
77
- sign_in FactoryGirl.create(:user)
77
+ sign_in FactoryBot.create(:user)
78
78
  end
79
79
 
80
80
  it "assigns the requested order_list as @order_list" do
81
- order_list = FactoryGirl.create(:order_list)
81
+ order_list = FactoryBot.create(:order_list)
82
82
  get :show, :id => order_list.id
83
83
  assigns(:order_list).should eq(order_list)
84
84
  end
@@ -86,7 +86,7 @@ describe OrderListsController do
86
86
 
87
87
  describe "When not logged in" do
88
88
  it "assigns the requested order_list as @order_list" do
89
- order_list = FactoryGirl.create(:order_list)
89
+ order_list = FactoryBot.create(:order_list)
90
90
  get :show, :id => order_list.id
91
91
  assigns(:order_list).should eq(order_list)
92
92
  end
@@ -96,7 +96,7 @@ describe OrderListsController do
96
96
  describe "GET new" do
97
97
  describe "When logged in as Administrator" do
98
98
  before(:each) do
99
- sign_in FactoryGirl.create(:admin)
99
+ sign_in FactoryBot.create(:admin)
100
100
  end
101
101
 
102
102
  it "assigns the requested order_list as @order_list" do
@@ -108,7 +108,7 @@ describe OrderListsController do
108
108
 
109
109
  describe "When logged in as Librarian" do
110
110
  before(:each) do
111
- sign_in FactoryGirl.create(:librarian)
111
+ sign_in FactoryBot.create(:librarian)
112
112
  end
113
113
 
114
114
  it "assigns the requested order_list as @order_list" do
@@ -120,7 +120,7 @@ describe OrderListsController do
120
120
 
121
121
  describe "When logged in as User" do
122
122
  before(:each) do
123
- sign_in FactoryGirl.create(:user)
123
+ sign_in FactoryBot.create(:user)
124
124
  end
125
125
 
126
126
  it "should not assign the requested order_list as @order_list" do
@@ -142,11 +142,11 @@ describe OrderListsController do
142
142
  describe "GET edit" do
143
143
  describe "When logged in as Administrator" do
144
144
  before(:each) do
145
- sign_in FactoryGirl.create(:admin)
145
+ sign_in FactoryBot.create(:admin)
146
146
  end
147
147
 
148
148
  it "assigns the requested order_list as @order_list" do
149
- order_list = FactoryGirl.create(:order_list)
149
+ order_list = FactoryBot.create(:order_list)
150
150
  get :edit, :id => order_list.id
151
151
  assigns(:order_list).should eq(order_list)
152
152
  end
@@ -154,11 +154,11 @@ describe OrderListsController do
154
154
 
155
155
  describe "When logged in as Librarian" do
156
156
  before(:each) do
157
- sign_in FactoryGirl.create(:librarian)
157
+ sign_in FactoryBot.create(:librarian)
158
158
  end
159
159
 
160
160
  it "assigns the requested order_list as @order_list" do
161
- order_list = FactoryGirl.create(:order_list)
161
+ order_list = FactoryBot.create(:order_list)
162
162
  get :edit, :id => order_list.id
163
163
  assigns(:order_list).should eq(order_list)
164
164
  end
@@ -166,11 +166,11 @@ describe OrderListsController do
166
166
 
167
167
  describe "When logged in as User" do
168
168
  before(:each) do
169
- sign_in FactoryGirl.create(:user)
169
+ sign_in FactoryBot.create(:user)
170
170
  end
171
171
 
172
172
  it "assigns the requested order_list as @order_list" do
173
- order_list = FactoryGirl.create(:order_list)
173
+ order_list = FactoryBot.create(:order_list)
174
174
  get :edit, :id => order_list.id
175
175
  response.should be_forbidden
176
176
  end
@@ -178,7 +178,7 @@ describe OrderListsController do
178
178
 
179
179
  describe "When not logged in" do
180
180
  it "should not assign the requested order_list as @order_list" do
181
- order_list = FactoryGirl.create(:order_list)
181
+ order_list = FactoryBot.create(:order_list)
182
182
  get :edit, :id => order_list.id
183
183
  response.should redirect_to(new_user_session_url)
184
184
  end
@@ -187,13 +187,13 @@ describe OrderListsController do
187
187
 
188
188
  describe "POST create" do
189
189
  before(:each) do
190
- @attrs = FactoryGirl.attributes_for(:order_list)
190
+ @attrs = FactoryBot.attributes_for(:order_list)
191
191
  @invalid_attrs = {:bookstore_id => ''}
192
192
  end
193
193
 
194
194
  describe "When logged in as Administrator" do
195
195
  before(:each) do
196
- sign_in FactoryGirl.create(:admin)
196
+ sign_in FactoryBot.create(:admin)
197
197
  end
198
198
 
199
199
  describe "with valid params" do
@@ -223,7 +223,7 @@ describe OrderListsController do
223
223
 
224
224
  describe "When logged in as Librarian" do
225
225
  before(:each) do
226
- sign_in FactoryGirl.create(:librarian)
226
+ sign_in FactoryBot.create(:librarian)
227
227
  end
228
228
 
229
229
  describe "with valid params" do
@@ -253,7 +253,7 @@ describe OrderListsController do
253
253
 
254
254
  describe "When logged in as User" do
255
255
  before(:each) do
256
- sign_in FactoryGirl.create(:user)
256
+ sign_in FactoryBot.create(:user)
257
257
  end
258
258
 
259
259
  describe "with valid params" do
@@ -310,14 +310,14 @@ describe OrderListsController do
310
310
 
311
311
  describe "PUT update" do
312
312
  before(:each) do
313
- @order_list = FactoryGirl.create(:order_list)
314
- @attrs = FactoryGirl.attributes_for(:order_list)
313
+ @order_list = FactoryBot.create(:order_list)
314
+ @attrs = FactoryBot.attributes_for(:order_list)
315
315
  @invalid_attrs = {:bookstore_id => ''}
316
316
  end
317
317
 
318
318
  describe "When logged in as Administrator" do
319
319
  before(:each) do
320
- sign_in FactoryGirl.create(:admin)
320
+ sign_in FactoryBot.create(:admin)
321
321
  end
322
322
 
323
323
  describe "with valid params" do
@@ -341,7 +341,7 @@ describe OrderListsController do
341
341
 
342
342
  describe "When logged in as Librarian" do
343
343
  before(:each) do
344
- sign_in FactoryGirl.create(:librarian)
344
+ sign_in FactoryBot.create(:librarian)
345
345
  end
346
346
 
347
347
  describe "with valid params" do
@@ -371,7 +371,7 @@ describe OrderListsController do
371
371
 
372
372
  describe "When logged in as User" do
373
373
  before(:each) do
374
- sign_in FactoryGirl.create(:user)
374
+ sign_in FactoryBot.create(:user)
375
375
  end
376
376
 
377
377
  describe "with valid params" do
@@ -417,12 +417,12 @@ describe OrderListsController do
417
417
 
418
418
  describe "DELETE destroy" do
419
419
  before(:each) do
420
- @order_list = FactoryGirl.create(:order_list)
420
+ @order_list = FactoryBot.create(:order_list)
421
421
  end
422
422
 
423
423
  describe "When logged in as Administrator" do
424
424
  before(:each) do
425
- sign_in FactoryGirl.create(:admin)
425
+ sign_in FactoryBot.create(:admin)
426
426
  end
427
427
 
428
428
  it "destroys the requested order_list" do
@@ -437,7 +437,7 @@ describe OrderListsController do
437
437
 
438
438
  describe "When logged in as Librarian" do
439
439
  before(:each) do
440
- sign_in FactoryGirl.create(:librarian)
440
+ sign_in FactoryBot.create(:librarian)
441
441
  end
442
442
 
443
443
  it "destroys the requested order_list" do
@@ -452,7 +452,7 @@ describe OrderListsController do
452
452
 
453
453
  describe "When logged in as User" do
454
454
  before(:each) do
455
- sign_in FactoryGirl.create(:user)
455
+ sign_in FactoryBot.create(:user)
456
456
  end
457
457
 
458
458
  it "destroys the requested order_list" do
@@ -7,12 +7,12 @@ describe OrdersController do
7
7
 
8
8
  describe "GET index" do
9
9
  before(:each) do
10
- FactoryGirl.create(:order)
10
+ FactoryBot.create(:order)
11
11
  end
12
12
 
13
13
  describe "When logged in as Administrator" do
14
14
  before(:each) do
15
- sign_in FactoryGirl.create(:admin)
15
+ sign_in FactoryBot.create(:admin)
16
16
  end
17
17
 
18
18
  it "assigns all orders as @orders" do
@@ -23,7 +23,7 @@ describe OrdersController do
23
23
 
24
24
  describe "When logged in as Librarian" do
25
25
  before(:each) do
26
- sign_in FactoryGirl.create(:librarian)
26
+ sign_in FactoryBot.create(:librarian)
27
27
  end
28
28
 
29
29
  it "assigns all orders as @orders" do
@@ -34,7 +34,7 @@ describe OrdersController do
34
34
 
35
35
  describe "When logged in as User" do
36
36
  before(:each) do
37
- sign_in FactoryGirl.create(:user)
37
+ sign_in FactoryBot.create(:user)
38
38
  end
39
39
 
40
40
  it "should be forbidden" do
@@ -56,11 +56,11 @@ describe OrdersController do
56
56
  describe "GET show" do
57
57
  describe "When logged in as Administrator" do
58
58
  before(:each) do
59
- sign_in FactoryGirl.create(:admin)
59
+ sign_in FactoryBot.create(:admin)
60
60
  end
61
61
 
62
62
  it "assigns the requested order as @order" do
63
- order = FactoryGirl.create(:order)
63
+ order = FactoryBot.create(:order)
64
64
  get :show, :id => order.id
65
65
  assigns(:order).should eq(order)
66
66
  end
@@ -68,11 +68,11 @@ describe OrdersController do
68
68
 
69
69
  describe "When logged in as Librarian" do
70
70
  before(:each) do
71
- sign_in FactoryGirl.create(:librarian)
71
+ sign_in FactoryBot.create(:librarian)
72
72
  end
73
73
 
74
74
  it "assigns the requested order as @order" do
75
- order = FactoryGirl.create(:order)
75
+ order = FactoryBot.create(:order)
76
76
  get :show, :id => order.id
77
77
  assigns(:order).should eq(order)
78
78
  end
@@ -80,11 +80,11 @@ describe OrdersController do
80
80
 
81
81
  describe "When logged in as User" do
82
82
  before(:each) do
83
- sign_in FactoryGirl.create(:user)
83
+ sign_in FactoryBot.create(:user)
84
84
  end
85
85
 
86
86
  it "assigns the requested order as @order" do
87
- order = FactoryGirl.create(:order)
87
+ order = FactoryBot.create(:order)
88
88
  get :show, :id => order.id
89
89
  assigns(:order).should eq(order)
90
90
  end
@@ -92,7 +92,7 @@ describe OrdersController do
92
92
 
93
93
  describe "When not logged in" do
94
94
  it "assigns the requested order as @order" do
95
- order = FactoryGirl.create(:order)
95
+ order = FactoryBot.create(:order)
96
96
  get :show, :id => order.id
97
97
  assigns(:order).should eq(order)
98
98
  end
@@ -102,7 +102,7 @@ describe OrdersController do
102
102
  describe "GET new" do
103
103
  describe "When logged in as Administrator" do
104
104
  before(:each) do
105
- sign_in FactoryGirl.create(:admin)
105
+ sign_in FactoryBot.create(:admin)
106
106
  end
107
107
 
108
108
  it "assigns the requested order as @order" do
@@ -126,7 +126,7 @@ describe OrdersController do
126
126
 
127
127
  describe "When logged in as Librarian" do
128
128
  before(:each) do
129
- sign_in FactoryGirl.create(:librarian)
129
+ sign_in FactoryBot.create(:librarian)
130
130
  end
131
131
 
132
132
  it "assigns the requested order as @order" do
@@ -138,7 +138,7 @@ describe OrdersController do
138
138
 
139
139
  describe "When logged in as User" do
140
140
  before(:each) do
141
- sign_in FactoryGirl.create(:user)
141
+ sign_in FactoryBot.create(:user)
142
142
  end
143
143
 
144
144
  it "should not assign the requested order as @order" do
@@ -160,11 +160,11 @@ describe OrdersController do
160
160
  describe "GET edit" do
161
161
  describe "When logged in as Administrator" do
162
162
  before(:each) do
163
- sign_in FactoryGirl.create(:admin)
163
+ sign_in FactoryBot.create(:admin)
164
164
  end
165
165
 
166
166
  it "assigns the requested order as @order" do
167
- order = FactoryGirl.create(:order)
167
+ order = FactoryBot.create(:order)
168
168
  get :edit, :id => order.id
169
169
  assigns(:order).should eq(order)
170
170
  end
@@ -172,11 +172,11 @@ describe OrdersController do
172
172
 
173
173
  describe "When logged in as Librarian" do
174
174
  before(:each) do
175
- sign_in FactoryGirl.create(:librarian)
175
+ sign_in FactoryBot.create(:librarian)
176
176
  end
177
177
 
178
178
  it "assigns the requested order as @order" do
179
- order = FactoryGirl.create(:order)
179
+ order = FactoryBot.create(:order)
180
180
  get :edit, :id => order.id
181
181
  assigns(:order).should eq(order)
182
182
  end
@@ -184,11 +184,11 @@ describe OrdersController do
184
184
 
185
185
  describe "When logged in as User" do
186
186
  before(:each) do
187
- sign_in FactoryGirl.create(:user)
187
+ sign_in FactoryBot.create(:user)
188
188
  end
189
189
 
190
190
  it "assigns the requested order as @order" do
191
- order = FactoryGirl.create(:order)
191
+ order = FactoryBot.create(:order)
192
192
  get :edit, :id => order.id
193
193
  response.should be_forbidden
194
194
  end
@@ -196,7 +196,7 @@ describe OrdersController do
196
196
 
197
197
  describe "When not logged in" do
198
198
  it "should not assign the requested order as @order" do
199
- order = FactoryGirl.create(:order)
199
+ order = FactoryBot.create(:order)
200
200
  get :edit, :id => order.id
201
201
  response.should redirect_to(new_user_session_url)
202
202
  end
@@ -205,13 +205,13 @@ describe OrdersController do
205
205
 
206
206
  describe "POST create" do
207
207
  before(:each) do
208
- @attrs = FactoryGirl.attributes_for(:order)
208
+ @attrs = FactoryBot.attributes_for(:order)
209
209
  @invalid_attrs = {:order_list_id => ''}
210
210
  end
211
211
 
212
212
  describe "When logged in as Administrator" do
213
213
  before(:each) do
214
- sign_in FactoryGirl.create(:admin)
214
+ sign_in FactoryBot.create(:admin)
215
215
  end
216
216
 
217
217
  describe "with valid params" do
@@ -241,7 +241,7 @@ describe OrdersController do
241
241
 
242
242
  describe "When logged in as Librarian" do
243
243
  before(:each) do
244
- sign_in FactoryGirl.create(:librarian)
244
+ sign_in FactoryBot.create(:librarian)
245
245
  end
246
246
 
247
247
  describe "with valid params" do
@@ -271,7 +271,7 @@ describe OrdersController do
271
271
 
272
272
  describe "When logged in as User" do
273
273
  before(:each) do
274
- sign_in FactoryGirl.create(:user)
274
+ sign_in FactoryBot.create(:user)
275
275
  end
276
276
 
277
277
  describe "with valid params" do
@@ -328,14 +328,14 @@ describe OrdersController do
328
328
 
329
329
  describe "PUT update" do
330
330
  before(:each) do
331
- @order = FactoryGirl.create(:order)
332
- @attrs = FactoryGirl.attributes_for(:order)
331
+ @order = FactoryBot.create(:order)
332
+ @attrs = FactoryBot.attributes_for(:order)
333
333
  @invalid_attrs = {:order_list_id => ''}
334
334
  end
335
335
 
336
336
  describe "When logged in as Administrator" do
337
337
  before(:each) do
338
- sign_in FactoryGirl.create(:admin)
338
+ sign_in FactoryBot.create(:admin)
339
339
  end
340
340
 
341
341
  describe "with valid params" do
@@ -360,7 +360,7 @@ describe OrdersController do
360
360
 
361
361
  describe "When logged in as Librarian" do
362
362
  before(:each) do
363
- sign_in FactoryGirl.create(:librarian)
363
+ sign_in FactoryBot.create(:librarian)
364
364
  end
365
365
 
366
366
  describe "with valid params" do
@@ -385,7 +385,7 @@ describe OrdersController do
385
385
 
386
386
  describe "When logged in as User" do
387
387
  before(:each) do
388
- sign_in FactoryGirl.create(:user)
388
+ sign_in FactoryBot.create(:user)
389
389
  end
390
390
 
391
391
  describe "with valid params" do
@@ -431,12 +431,12 @@ describe OrdersController do
431
431
 
432
432
  describe "DELETE destroy" do
433
433
  before(:each) do
434
- @order = FactoryGirl.create(:order)
434
+ @order = FactoryBot.create(:order)
435
435
  end
436
436
 
437
437
  describe "When logged in as Administrator" do
438
438
  before(:each) do
439
- sign_in FactoryGirl.create(:admin)
439
+ sign_in FactoryBot.create(:admin)
440
440
  end
441
441
 
442
442
  it "destroys the requested order" do
@@ -451,7 +451,7 @@ describe OrdersController do
451
451
 
452
452
  describe "When logged in as Librarian" do
453
453
  before(:each) do
454
- sign_in FactoryGirl.create(:librarian)
454
+ sign_in FactoryBot.create(:librarian)
455
455
  end
456
456
 
457
457
  it "destroys the requested order" do
@@ -466,7 +466,7 @@ describe OrdersController do
466
466
 
467
467
  describe "When logged in as User" do
468
468
  before(:each) do
469
- sign_in FactoryGirl.create(:user)
469
+ sign_in FactoryBot.create(:user)
470
470
  end
471
471
 
472
472
  it "destroys the requested order" do