Merge branch 'master' into dependabot/bundler/ruby-prof-0.18.0

This commit is contained in:
Andrew Brown 2019-05-30 15:53:33 -07:00 committed by GitHub
commit 3a18319931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -198,14 +198,14 @@ RSpec.describe SubscriptionsController, type: :controller do
describe "Premium Permissions" do
it "allows Premium users to create core content types" do
@user.update(selected_billing_plan_id: @premium_plan.id)
@user.update(selected_billing_plan_id: 4)
expect(@user.can_create?(Character)).to eq(true)
expect(@user.can_create?(Location)).to eq(true)
expect(@user.can_create?(Item)).to eq(true)
end
it "allows Premium users to create extended content types" do
@user.update(selected_billing_plan_id: @premium_plan.id)
@user.update(selected_billing_plan_id: 4)
expect(@user.can_create?(Creature)).to eq(true)
expect(@user.can_create?(Race)).to eq(true)
expect(@user.can_create?(Religion)).to eq(true)
@ -216,7 +216,7 @@ RSpec.describe SubscriptionsController, type: :controller do
end
it "allows Premium users to create collective content types" do
@user.update(selected_billing_plan_id: @premium_plan.id)
@user.update(selected_billing_plan_id: 4)
expect(@user.can_create?(Scene)).to eq(true)
end
end