From 1b216cd31fd6dca8c783db6299ba40bc9419661c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Sun, 26 May 2019 22:28:27 +0000 Subject: [PATCH 1/6] Bump memory_profiler from 0.9.12 to 0.9.13 Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.12 to 0.9.13. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.12...v0.9.13) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dce396f2..d252d891 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) From 30ce73c2d1b9175224d41f1220170564600de389 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 10:55:11 +0000 Subject: [PATCH 2/6] Bump rack-mini-profiler from 1.0.1 to 1.0.2 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.0.1...v1.0.2) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dce396f2..b38c59c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) From 8bed507e25c05fa9af94109290895c7e1bd300de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 30 May 2019 10:34:20 +0000 Subject: [PATCH 3/6] Bump ruby-prof from 0.15.9 to 0.18.0 Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 0.15.9 to 0.18.0. - [Release notes](https://github.com/ruby-prof/ruby-prof/releases) - [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES) - [Commits](https://github.com/ruby-prof/ruby-prof/compare/v0.15.9...0.18.0) --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 477c2570..e6ad4936 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index dce396f2..88167733 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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! From 9ac979ec456f2cfcbce273fae50b4cd292bf5007 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 30 May 2019 16:15:39 -0500 Subject: [PATCH 4/6] parallel tests are hard --- spec/controllers/subscriptions_controller_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/controllers/subscriptions_controller_spec.rb b/spec/controllers/subscriptions_controller_spec.rb index dc867487..2ab6b04a 100644 --- a/spec/controllers/subscriptions_controller_spec.rb +++ b/spec/controllers/subscriptions_controller_spec.rb @@ -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: @premium_plan.id) 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) 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: @premium_plan.id) expect(@user.can_create?(Scene)).to eq(true) end end From 1e54caf2378e363e53ce52d561aa24b7da953e9a Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 30 May 2019 16:28:00 -0500 Subject: [PATCH 5/6] zzz --- spec/controllers/subscriptions_controller_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/controllers/subscriptions_controller_spec.rb b/spec/controllers/subscriptions_controller_spec.rb index 2ab6b04a..a6aad216 100644 --- a/spec/controllers/subscriptions_controller_spec.rb +++ b/spec/controllers/subscriptions_controller_spec.rb @@ -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 From 440081c7bf000cd7d2686093317bfe7d03e11f63 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 30 May 2019 22:57:55 +0000 Subject: [PATCH 6/6] Bump rspec-rails from 3.8.1 to 3.8.2 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 88167733..10b0e979 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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)