From dcacf031dfec3bb473406caadf84ff3fc33e4327 Mon Sep 17 00:00:00 2001 From: Sean <11340230+scarroll32@users.noreply.github.com> Date: Wed, 10 Nov 2021 16:43:29 +0100 Subject: [PATCH] Revert "Add spec described in #1153." --- spec/ransack/indirect_association_spec.rb | 31 ------------ spec/support/schema.rb | 62 ----------------------- 2 files changed, 93 deletions(-) delete mode 100644 spec/ransack/indirect_association_spec.rb diff --git a/spec/ransack/indirect_association_spec.rb b/spec/ransack/indirect_association_spec.rb deleted file mode 100644 index 9c06cdb..0000000 --- a/spec/ransack/indirect_association_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'spec_helper' - -module Ransack - describe Search do - describe '#ransack' do - context 'parameters provided in a harmonious order' do - it 'produces the expected result' do - result = ProviderCalendar. - ransack({ "account_email_cont" => "account1", "user_email_eq" => "user2@somedomain.com" }). - result. - map(&:provider_id). - sort - - expect(result).to eq(["account1_user2@mail.com", "aksshkdhak@whatever.provider.com"]) - end - end - - context 'parameters provided in a disharmonious order' do - it 'produces the expected result' do - result = ProviderCalendar. - ransack({ "user_email_eq" => "user2@somedomain.com", "account_email_cont" => "account1" }). - result. - map(&:provider_id). - sort - - expect(result).to eq(["account1_user2@mail.com", "aksshkdhak@whatever.provider.com"]) - end - end - end - end -end diff --git a/spec/support/schema.rb b/spec/support/schema.rb index c8ba56d..f7f7749 100644 --- a/spec/support/schema.rb +++ b/spec/support/schema.rb @@ -199,34 +199,6 @@ class Note < ActiveRecord::Base belongs_to :notable, polymorphic: true end -class User < ActiveRecord::Base - has_many :accounts, - class_name: "ProviderAccount" - has_many :contacts, - class_name: "ProviderContact", - through: :accounts, - source: :contacts - has_many :calendars, - class_name: "ProviderCalendar", - through: :accounts, - source: :calendars -end - -class ProviderAccount < ActiveRecord::Base - belongs_to :user - - has_many :calendars, class_name: "ProviderCalendar" -end - -class ProviderCalendar < ActiveRecord::Base - belongs_to :account, - class_name: "ProviderAccount", - foreign_key: "provider_account_id", - inverse_of: :calendars - - has_one :user, through: :account -end - module Schema def self.create ActiveRecord::Migration.verbose = false @@ -285,25 +257,6 @@ module Schema t.integer :target_person_id t.integer :article_id end - - create_table "users", force: :cascade do |t| - t.string "email", default: "", null: false - t.index ["email"], name: "idx_users_on_email", unique: true - end - - create_table "provider_accounts", force: :cascade do |t| - t.bigint "user_id", null: false - t.string "email", null: false - t.index ["email"], name: "idx_p_accounts_on_email" - t.index ["user_id"], name: "idx_p_accounts_on_user_id" - end - - create_table "provider_calendars", force: :cascade do |t| - t.bigint "provider_account_id", null: false - t.string "provider_id", null: false - t.index ["provider_account_id", "provider_id"], name: "idx_p_calendars_on_p_account_id_and_p_id", unique: true - t.index ["provider_account_id"], name: "idx_p_calendars_on_p_account_id" - end end 10.times do @@ -325,21 +278,6 @@ module Schema body: 'First post!', article: Article.make(title: 'Hello, world!') ) - - user1 = User.create!(email: "user1@somedomain.com") - user2 = User.create!(email: "user2@somedomain.com") - user1_acct1 = ProviderAccount.create!(user: user1, email: "account1_user1@mail.com") - user1_acct2 = ProviderAccount.create!(user: user1, email: "account2_user1@mail.com") - user2_acct1 = ProviderAccount.create!(user: user2, email: "account1_user2@mail.com") - user2_acct2 = ProviderAccount.create!(user: user2, email: "account2_user2@mail.com") - ProviderCalendar.create!(account: user1_acct1, provider_id: "account1_user1@mail.com") - ProviderCalendar.create!(account: user1_acct1, provider_id: "something_else@whatever.provider.com") - ProviderCalendar.create!(account: user1_acct2, provider_id: "account2_user1@mail.com") - ProviderCalendar.create!(account: user1_acct2, provider_id: "blahblahblah@whatever.provider.com") - ProviderCalendar.create!(account: user2_acct1, provider_id: "account1_user2@mail.com") - ProviderCalendar.create!(account: user2_acct1, provider_id: "aksshkdhak@whatever.provider.com") - ProviderCalendar.create!(account: user2_acct2, provider_id: "account2_user2@mail.com") - ProviderCalendar.create!(account: user2_acct2, provider_id: "noisenoisenoise@whatever.provider.com") end end