Remove link between team.owner and tournament
This commit is contained in:
parent
dded01ebee
commit
787ed810d7
|
|
@ -4,5 +4,5 @@ class MatchScore < ApplicationRecord
|
||||||
belongs_to :match
|
belongs_to :match
|
||||||
belongs_to :team
|
belongs_to :team
|
||||||
|
|
||||||
delegate :owner, to: :team
|
delegate :owner, to: :match
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,5 +7,8 @@ class Team < ApplicationRecord
|
||||||
|
|
||||||
validates :name, presence: true
|
validates :name, presence: true
|
||||||
|
|
||||||
delegate :owner, to: :tournament
|
def owner
|
||||||
|
match_scores.first.owner
|
||||||
|
# this will produce errors if we make teams reusable
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@ require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe TeamsController, type: :controller do
|
RSpec.describe TeamsController, type: :controller do
|
||||||
before do
|
before do
|
||||||
@team = create(:team)
|
match_score = create(:match_score)
|
||||||
|
@team = match_score.team
|
||||||
@owner = @team.owner
|
@owner = @team.owner
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@ RSpec.describe TournamentsController, type: :controller do
|
||||||
@user = @tournament.owner
|
@user = @tournament.owner
|
||||||
@another_user = create(:user)
|
@another_user = create(:user)
|
||||||
@private_tournament = create(:tournament, user: @another_user, public: false)
|
@private_tournament = create(:tournament, user: @another_user, public: false)
|
||||||
@teams = create_list(:detached_team, 4)
|
@teams = create_list(:team, 4)
|
||||||
@teams16 = create_list(:detached_team, 16)
|
@teams16 = create_list(:team, 16)
|
||||||
@groups = create_list(:group, 4)
|
@groups = create_list(:group, 4)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,5 @@
|
||||||
FactoryBot.define do
|
FactoryBot.define do
|
||||||
factory :team do
|
factory :team do
|
||||||
name { Faker::Creature::Dog.name }
|
name { Faker::Creature::Dog.name }
|
||||||
tournament
|
|
||||||
end
|
|
||||||
|
|
||||||
factory :detached_team, class: Team do
|
|
||||||
name { Faker::Creature::Dog.name }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,5 @@ RSpec.describe Team, type: :model do
|
||||||
|
|
||||||
it 'has a valid factory' do
|
it 'has a valid factory' do
|
||||||
expect(build(:team)).to be_valid
|
expect(build(:team)).to be_valid
|
||||||
expect(build(:detached_team)).to be_valid
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue