Merge pull request #3664 from rubyforgood/fix-tests-jun13

Fix tests jun13

app/controllers/application_controller.rb

@@ -31,10 +31,12 @@ def current_partner
   helper_method :current_partner
 
   def current_role
-    role = Role.find_by(id: session[:current_role]) || UsersRole.current_role_for(current_user)
-    session[:current_role] = role&.id
+    return @role if @role
 
-    role
+    @role = Role.find_by(id: session[:current_role]) || UsersRole.current_role_for(current_user)
+    session[:current_role] = @role&.id
+
+    @role
   end
 
   def organization_url_options(options = {})

app/controllers/users_controller.rb

@@ -16,6 +16,7 @@ def switch_to_role
       return
     end
 
+    @role = role
     session[:current_role] = params[:role_id]
     redirect_to dashboard_path_from_current_role
   end

spec/factories/partners/profile.rb

@@ -2,5 +2,6 @@
   factory :partner_profile, class: Partners::Profile do
     partner { Partner.first || create(:partner) }
     essentials_bank_id { Organization.try(:first).id || create(:organization).id }
+    website { "http://some-site.org" }
   end
 end

spec/requests/admin/organizations_requests_spec.rb

@@ -68,7 +68,7 @@
           expect {
             post admin_organizations_path({ organization: valid_organization_params })
           }.to change(Organization, :count).by(1)
-          expect(response).to redirect_to(admin_organizations_path(organization_id: Organization.first.short_name))
+          expect(response).to redirect_to(admin_organizations_path(organization_id: 'admin'))
         end
       end