mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dependabot/bundler/paranoia-2.4.2

Browse Source
This commit is contained in:
Andrew Brown 2019-05-30 16:00:07 -07:00 committed by GitHub
commit 756cc9d391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -114,7 +114,7 @@ group :test do
gem 'rspec-rails'
gem 'webmock'
gem 'rubocop', require: false
gem 'ruby-prof', '0.15.9'
gem 'ruby-prof', '0.18.0'
gem 'shoulda-matchers', '~> 3.1'
gem 'rails-controller-testing'
end

12
Gemfile.lock
View File

@ -258,7 +258,7 @@ GEM
railties (>= 3.2)
medium-editor-rails (2.3.1)
railties (>= 3.0)
memory_profiler (0.9.12)
memory_profiler (0.9.13)
meta-tags (2.11.0)
actionpack (>= 3.2.0, < 5.3)
method_source (0.9.2)
@ -322,7 +322,7 @@ GEM
pundit (2.0.1)
activesupport (>= 3.0.0)
rack (2.0.7)
rack-mini-profiler (1.0.1)
rack-mini-profiler (1.0.2)
rack (>= 1.2.0)
rack-pjax (1.0.0)
nokogiri (~> 1.5)
@ -403,7 +403,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
rspec-expectations (3.8.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
@ -412,7 +412,7 @@ GEM
rspec-prof (0.0.7)
rspec (~> 3.0)
ruby-prof
rspec-rails (3.8.1)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@ -430,7 +430,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
ruby-prof (0.15.9)
ruby-prof (0.18.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
@ -607,7 +607,7 @@ DEPENDENCIES
rspec-prof
rspec-rails
rubocop
ruby-prof (= 0.15.9)
ruby-prof (= 0.18.0)
sass-rails
selenium-webdriver
serendipitous!

3
spec/controllers/subscriptions_controller_spec.rb
View File

@ -198,12 +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: 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: 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)
@ -214,6 +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: 4)
expect(@user.can_create?(Scene)).to eq(true)
end
end