refactor: removed db seeding dependency

find and replace in requests

Author: elasticspoon

spec/requests/account_requests_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "/account_requests", type: :request do
+RSpec.describe "/account_requests", type: :request, skip_seed: true do
   describe "GET #new" do
     it "renders a successful response" do
       get new_account_request_url
@@ -37,7 +37,7 @@
     context 'when given a token that has already been confirmed' do
       let!(:account_request) { FactoryBot.create(:account_request) }
       before do
-        FactoryBot.create(:organization, account_request_id: account_request.id)
+        create(:organization, account_request_id: account_request.id)
       end
 
       it 'should render a error that says that is code provided is invalid' do

spec/requests/adjustments_requests_spec.rb

@@ -1,17 +1,20 @@
 require "rails_helper"
 
-RSpec.describe "Adjustments", type: :request do
+RSpec.describe "Adjustments", type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+  let(:user) { create(:user, organization: organization) }
+
   let(:default_params) do
-    { organization_name: @organization.to_param }
+    { organization_name: organization.to_param }
   end
 
   # This should return the minimal set of attributes required to create a valid
   # Adjustment. As you add validations to Adjustment, be sure to
   # adjust the attributes here as well.
   let(:valid_attributes) do
     {
-      organization_id: @organization.id,
-      storage_location_id: create(:storage_location, organization: @organization).id
+      organization_id: organization.id,
+      storage_location_id: create(:storage_location, organization: organization).id
     }
   end
 
@@ -24,11 +27,11 @@
   # AdjustmentsController. Be sure to keep this updated too.
   let(:valid_session) { {} }
 
-  let(:adjustment) { Adjustment.create! valid_attributes.merge(user_id: @user.id) }
+  let(:adjustment) { Adjustment.create! valid_attributes.merge(user_id: user.id) }
 
   describe "while signed in" do
     before do
-      sign_in(@user)
+      sign_in(user)
     end
 
     describe "GET #index" do
@@ -113,7 +116,7 @@
 
         it "assigns a user id from the current user" do
           post adjustments_path(default_params.merge(adjustment: valid_attributes))
-          expect(assigns(:adjustment).user_id).to eq(@user.id)
+          expect(assigns(:adjustment).user_id).to eq(user.id)
         end
 
         it "redirects to the #show after created adjustment" do

spec/requests/admin/account_requests_requests_spec.rb

@@ -1,9 +1,11 @@
 require 'rails_helper'
 
-RSpec.describe 'Admin::AccountRequestsController', type: :request do
+RSpec.describe 'Admin::AccountRequestsController', type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+
   context 'while signed in as a super admin' do
     before do
-      sign_in(@super_admin)
+      sign_in(create(:super_admin, organization: organization))
     end
 
     describe 'GET #index' do
@@ -14,7 +16,7 @@
     end
 
     describe 'GET #for_rejection' do
-      let(:account_request) { FactoryBot.create(:account_request, organization_name: 'Test Org 1') }
+      let(:account_request) { create(:account_request, organization_name: 'Test Org 1') }
 
       context 'with an invalid token' do
         it 'should show a not found message' do
@@ -26,7 +28,7 @@
 
       context 'with a valid token' do
         it 'should show the request' do
-          FactoryBot.create(:account_request, organization_name: 'Test Org 2')
+          create(:account_request, organization_name: 'Test Org 2')
           allow(AccountRequest).to receive(:get_by_identity_token).and_return(account_request)
           get for_rejection_admin_account_requests_path(token: 'my token')
           expect(response.body).to match(/Test Org 1/)

spec/requests/admin/barcode_items_requests_spec.rb

@@ -1,9 +1,11 @@
 require 'rails_helper'
 
-RSpec.describe 'Admin::BarcodeItemsController', type: :request do
+RSpec.describe 'Admin::BarcodeItemsController', type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+
   context 'while signed in as a super admin' do
     before do
-      sign_in(@super_admin)
+      sign_in(create(:super_admin, organization: organization))
     end
 
     describe 'GET #index' do

spec/requests/admin/base_items_requests_spec.rb

@@ -1,6 +1,11 @@
 require 'rails_helper'
 
-RSpec.describe "Admin::BaseItems", type: :request do
+RSpec.describe "Admin::BaseItems", type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+  let(:user) { create(:user, organization: organization) }
+  let(:organization_admin) { create(:organization_admin, organization: organization) }
+
+  # TODO: should this be testing something?
   context "while signed in as a super admin" do
     before do
       sign_in(@super_admin)
@@ -9,7 +14,7 @@
 
   context "When logged in as an organization admin" do
     before do
-      sign_in(@organization_admin)
+      sign_in(organization_admin)
     end
 
     describe "GET #new" do
@@ -35,28 +40,28 @@
 
     describe "GET #show" do
       it "returns http success" do
-        get admin_base_item_path(id: @organization.id)
+        get admin_base_item_path(id: organization.id)
         expect(response).to have_http_status(:found)
       end
     end
 
     describe "GET #edit" do
       it "returns http success" do
-        get edit_admin_base_item_path(id: @organization.id)
+        get edit_admin_base_item_path(id: organization.id)
         expect(response).to have_http_status(:found)
       end
     end
 
     describe "PUT #update" do
       it "redirect" do
-        put admin_base_item_path(id: @organization.id, organization: { name: "Foo" })
+        put admin_base_item_path(id: organization.id, organization: { name: "Foo" })
         expect(response).to be_redirect
       end
     end
 
     describe "DELETE #destroy" do
       it "redirects" do
-        delete admin_base_item_path(id: @organization.id)
+        delete admin_base_item_path(id: organization.id)
         expect(response).to be_redirect
       end
     end

spec/requests/admin/broadcast_announcements_spec.rb

@@ -1,15 +1,21 @@
 require "rails_helper"
 
-RSpec.describe "BroadcastAnnouncements", type: :request do
+RSpec.describe "BroadcastAnnouncements", type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+  let(:user) { create(:super_admin, organization: organization) }
+  let(:super_admin) { create(:super_admin, organization: organization) }
+  let(:organization_admin) { create(:organization_admin, organization: organization) }
+
   before do
-    sign_in(@super_admin)
+    sign_in(super_admin)
   end
+
   let(:valid_attributes) {
     {
       expiry: Time.zone.today,
       link: "http://google.com",
       message: "test",
-      user_id: @user.id,
+      user_id: user.id,
       organization_id: nil
     }
   }
@@ -74,8 +80,8 @@
           expiry: Time.zone.yesterday,
           link: "http://google.com",
           message: "new_test",
-          user_id: @user.id,
-          organization_id: @organization.id
+          user_id: user.id,
+          organization_id: organization.id
         }
       }
 
@@ -109,20 +115,20 @@
 
   context "When logged in as an organization_admin" do
     before do
-      sign_in @organization_admin
+      sign_in organization_admin
     end
 
     describe "GET /new" do
       it "redirects" do
         get new_admin_broadcast_announcement_url
-        expect(response).to redirect_to(dashboard_path(organization_name: @organization_admin.organization))
+        expect(response).to redirect_to(dashboard_path(organization_name: organization_admin.organization))
       end
     end
 
     describe "POST /create" do
       it "redirects" do
-        post admin_broadcast_announcements_url, params: {user: @user.id, message: "test"}
-        expect(response).to redirect_to(dashboard_path(organization_name: @organization_admin.organization))
+        post admin_broadcast_announcements_url, params: {user: user.id, message: "test"}
+        expect(response).to redirect_to(dashboard_path(organization_name: organization_admin.organization))
       end
     end
   end

spec/requests/admin/ndbn_members_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe "NDBNMembers", type: :request do
+RSpec.describe "NDBNMembers", type: :request, skip_seed: true do
   let(:user) { create(:super_admin) }
 
   before do

spec/requests/admin/organizations_requests_spec.rb

@@ -1,11 +1,12 @@
-RSpec.describe "Admin::Organizations", type: :request do
+RSpec.describe "Admin::Organizations", type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
   let(:default_params) do
-    { organization_name: @organization.id }
+    { organization_name: organization.id }
   end
 
   context "When logged in as a super admin" do
     before do
-      sign_in(@super_admin)
+      sign_in(create(:super_admin, organization: organization))
     end
 
     describe "GET #new" do
@@ -15,10 +16,10 @@
       end
 
       context 'when given a valid account request token in the query parameters' do
-        let!(:account_request) { FactoryBot.create(:account_request) }
+        let!(:account_request) { create(:account_request) }
 
         it 'should render new with pre populate input fields from the account_request' do
-          ndbn_member = FactoryBot.create(:ndbn_member)
+          ndbn_member = create(:ndbn_member)
           account_request.ndbn_member = ndbn_member
           account_request.save
 
@@ -160,22 +161,22 @@
 
     describe "PUT #update" do
       it "redirect" do
-        put admin_organization_path({ id: @organization.id, organization: { name: "Foo" } })
+        put admin_organization_path({ id: organization.id, organization: { name: "Foo" } })
         expect(response).to be_redirect
       end
     end
 
     describe "DELETE #destroy" do
       it "redirects" do
-        delete admin_organization_path({ id: @organization.id })
+        delete admin_organization_path({ id: organization.id })
         expect(response).to redirect_to(admin_organizations_path)
       end
     end
   end
 
   context "When logged in as a non-admin user" do
     before do
-      sign_in(@user)
+      sign_in(create(:user, organization: organization))
     end
 
     describe "GET #new" do
@@ -201,14 +202,14 @@
 
     describe "GET #edit" do
       it "redirects" do
-        get edit_admin_organization_path({ id: @organization.id })
+        get edit_admin_organization_path({ id: organization.id })
         expect(response).to be_redirect
       end
     end
 
     describe "PUT #update" do
       it "redirects" do
-        put admin_organization_path({ id: @organization.id, organization: { name: "Foo" } })
+        put admin_organization_path({ id: organization.id, organization: { name: "Foo" } })
         expect(response).to be_redirect
       end
     end

spec/requests/admin/partners_requests_spec.rb

@@ -1,9 +1,13 @@
 require 'rails_helper'
 
-RSpec.describe "Admin::Partners", type: :request do
+RSpec.describe "Admin::Partners", type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+  let(:user) { create(:user, organization: organization) }
+  let(:organization_admin) { create(:organization_admin, organization: organization) }
+
   context "When logged in as a super admin" do
     before do
-      sign_in(@super_admin)
+      sign_in(create(:super_admin, organization: nil))
     end
 
     let(:partner) { create(:partner) }

spec/requests/admin/questions_spec.rb

@@ -1,9 +1,9 @@
 require "rails_helper"
 
-RSpec.describe "Admin::Questions", type: :request do
+RSpec.describe "Admin::Questions", type: :request, skip_seed: true do
   context "while signed in as a super admin" do
     before do
-      sign_in(@super_admin_no_org)
+      sign_in(create(:super_admin, organization: nil))
     end
 
     describe "GET #index" do

spec/requests/admin_requests_spec.rb

@@ -1,7 +1,11 @@
-RSpec.describe "Admin", type: :request do
+RSpec.describe "Admin", type: :request, skip_seed: true do
+  let(:organization) { create(:organization, skip_items: true) }
+  let(:user) { create(:user, organization: organization) }
+  let(:organization_admin) { create(:organization_admin, organization: organization) }
+
   context "while signed in as a super admin" do
     before do
-      sign_in(@super_admin_no_org)
+      sign_in(create(:super_admin, organization: nil))
     end
 
     it "allows a user to load the dashboard" do
@@ -52,7 +56,7 @@
 
   context "while signed in as a non-super-admin" do
     it "disallows dashboard access, redirecting to the normal dashboard" do
-      [@organization_admin, @user].each do |u|
+      [organization_admin, user].each do |u|
         sign_in(u)
         get admin_dashboard_path
         expect(response).to redirect_to(dashboard_path(organization_name: u.organization))

spec/requests/attachments_requests_spec.rb

@@ -1,6 +1,6 @@
-RSpec.describe "Attachments", type: :request do
+RSpec.describe "Attachments", type: :request, skip_seed: true do
   before do
-    sign_in(@user)
+    sign_in(create(:user))
   end
 
   describe "DELETE #destroy" do