Skip to content

Commit

Permalink
Fix tests that required the family requests feature
Browse files Browse the repository at this point in the history
  • Loading branch information
benreyn committed Oct 21, 2019
1 parent 6ee2f83 commit 89a9b18
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
24 changes: 12 additions & 12 deletions app/views/layouts/_sidebar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
</li>
<% end %>
<% if Flipper[:family_requests].enabled?(current_partner) %>
<li>
<%= link_to families_path, class: "app-menu__item #{'active' if current_page?(families_path)}" do %>
<i class="fa fa-users app-menu__icon"></i>
<span class="app-menu__label">Families</span>
<% end %>
</li>
<li>
<%= link_to children_path, class: "app-menu__item #{'active' if current_page?(children_path)}" do %>
<i class="fa fa-child app-menu__icon"></i>
<span class="app-menu__label">Children</span>
<% end %>
</li>
<li>
<%= link_to families_path, class: "app-menu__item #{'active' if current_page?(families_path)}" do %>
<i class="fa fa-users app-menu__icon"></i>
<span class="app-menu__label">Families</span>
<% end %>
</li>
<li>
<%= link_to children_path, class: "app-menu__item #{'active' if current_page?(children_path)}" do %>
<i class="fa fa-child app-menu__icon"></i>
<span class="app-menu__label">Children</span>
<% end %>
</li>
<% end %>
</ul>
</aside>
7 changes: 6 additions & 1 deletion config/initializers/flipper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@

Flipper.configure do |config|
config.default do
adapter = Flipper::Adapters::ActiveRecord.new
adapter =
if Rails.env.test?
Flipper::Adapters::Memory.new
else
Flipper::Adapters::ActiveRecord.new
end
Flipper.new(adapter)
end
end
Expand Down
3 changes: 2 additions & 1 deletion spec/features/authorized_family_member_feature_spec.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
require "rails_helper"

describe AuthorizedFamilyMember, type: :feature do
let!(:partner) { create(:partner, id: 3) }
let!(:partner) { create(:partner) }
let!(:user) { create(:user, partner: partner) }
let!(:family) { create(:family, partner: partner) }

before do
Flipper[:family_requests].enable(partner)
sign_in(user)
visit(families_path)
end
Expand Down
6 changes: 4 additions & 2 deletions spec/features/child_feature_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
require "rails_helper"

describe Child, type: :feature, js: true do
let(:partner) { create(:partner, id: 3) }
describe Child, type: :feature do
let(:partner) { create(:partner) }
let(:user) { create(:user, partner: partner) }

before do
Flipper[:family_requests].enable(partner)
sign_in(user)
visit(root_path)
end
Expand All @@ -19,6 +20,7 @@
create(:child, last_name: "Zeno", family: family),
create(:child, last_name: "Arthur", family: family)
].reverse

click_link "Children"
children.each.with_index do |child, index|
within "tbody" do
Expand Down

0 comments on commit 89a9b18

Please sign in to comment.