Fix tests after rebase from qa

db/schema.rb

@@ -22,8 +22,8 @@
   create_table "active_storage_attachments", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
-    t.bigint "record_id", null: false
-    t.bigint "blob_id", null: false
+    t.integer "record_id", null: false
+    t.integer "blob_id", null: false
     t.datetime "created_at", null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
@@ -42,7 +42,7 @@
   end
 
   create_table "active_storage_variant_records", force: :cascade do |t|
-    t.bigint "blob_id", null: false
+    t.integer "blob_id", null: false
     t.string "variation_digest", null: false
     t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
   end

db/seeds.rb

@@ -75,21 +75,24 @@ class AddSeedObjects < ActiveRecord::Migration[5.1]
          display_name: 'John Green',
          password: 'notapass',
          password_confirmation: 'notapass',
-         role: 'read_only'
+         role: 'read_only',
+         username: 'johngreen'
        },
        {
          email: '[email protected]',
          display_name: 'JK Rowling',
          password: 'notapass',
          password_confirmation: 'notapass',
-         role: 'standard'
+         role: 'standard',
+         username: 'jkrowling'
        },
        {
          email: '[email protected]',
          display_name: 'Chuck Greenman',
          password: 'notapass',
          password_confirmation: 'notapass',
-         role: 'admin'
+         role: 'admin',
+         username: 'chuck'
        }]
     )
 

spec/seeds/seeds_spec.rb

@@ -30,9 +30,9 @@ def with_seedable(value)
 
     it 'seeds the user data' do
       expect(User.count).to be > 0
-      expect(User.find_by(email: 'johngreen@example.com')).not_to be_nil
-      expect(User.find_by(email: 'jkrowling@example.com')).not_to be_nil
-      expect(User.find_by(email: 'chuck@chuck.codes')).not_to be_nil
+      expect(User.find_by(email: 'johngreen@uc.edu')).not_to be_nil
+      expect(User.find_by(email: 'jkrowling@uc.edu')).not_to be_nil
+      expect(User.find_by(email: 'chuck@uc.edu')).not_to be_nil
     end
 
     it 'seeds the conservation record data' do