paid_up 0.11.7 → 0.12.3

data/spec/models/user_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'cancan/matchers'
 
@@ -10,7 +12,7 @@ describe User do
   end
 
   context '#cards' do
-    subject { professional_subscriber.cards.first }
+    subject { prof_subscriber.cards.first }
     it { should be_a Stripe::Card }
   end
 
@@ -67,13 +69,13 @@ describe User do
 
       context 'starting from higher subscription' do
         before do
-          professional_subscriber.subscribe_to_free_plan
+          prof_subscriber.subscribe_to_free_plan
         end
         after do
           token = working_stripe_token no_ads_subscriber
-          professional_subscriber.subscribe_to_plan professional_plan, token
+          prof_subscriber.subscribe_to_plan professional_plan, token
         end
-        subject { professional_subscriber.plan }
+        subject { prof_subscriber.plan }
         it { should eq(free_plan) }
       end
     end
@@ -90,115 +92,115 @@ describe User do
     end
   end
 
-  context '#table_rows_remaining' do
+  context '#table_setting().rows_remaining' do
     context 'when using a plan without the feature' do
-      subject { no_ads_subscriber.table_rows_remaining 'doodads' }
+      subject { no_ads_subscriber.table_setting('doodads').rows_remaining }
       it { should eq 0 }
     end
     context 'when subscribed to a plan with the feature limited' do
-      subject { group_leader_subscriber.table_rows_remaining 'doodads' }
+      subject { leader_subscriber.table_setting('doodads').rows_remaining }
       it { should eq 10 }
     end
     context 'when subscribed to a plan with the feature unlimited' do
-      subject { professional_subscriber.table_rows_remaining 'doodads' }
+      subject { prof_subscriber.table_setting('doodads').rows_remaining }
       it { should eq PaidUp::Unlimited.to_i }
     end
   end
 
-  context '#table_rows_unlimited?' do
+  context '#table_setting().rows_unlimited?' do
     context 'when using a plan without the feature' do
-      subject { no_ads_subscriber.table_rows_unlimited? 'doodads' }
+      subject { no_ads_subscriber.table_setting('doodads').rows_unlimited? }
       it { should eq false }
     end
     context 'when subscribed to a plan with the feature limited' do
-      subject { group_leader_subscriber.table_rows_unlimited? 'doodads' }
+      subject { leader_subscriber.table_setting('doodads').rows_unlimited? }
       it { should eq false }
     end
     context 'when subscribed to a plan with the feature unlimited' do
-      subject { professional_subscriber.table_rows_unlimited? 'doodads' }
+      subject { prof_subscriber.table_setting('doodads').rows_unlimited? }
       it { should eq true }
     end
   end
 
-  context '#table_rows_allowed' do
+  context '#table_setting().rows_allowed' do
     context 'when using a plan without the feature' do
-      subject { no_ads_subscriber.table_rows_allowed 'doodads' }
+      subject { no_ads_subscriber.table_setting('doodads').rows_allowed }
       it { should eq 0 }
     end
     context 'when subscribed to a plan with the feature limited' do
-      subject { group_leader_subscriber.table_rows_allowed 'doodads' }
+      subject { leader_subscriber.table_setting('doodads').rows_allowed }
       it { should eq 10 }
     end
     context 'when subscribed to a plan with the feature unlimited' do
-      subject { professional_subscriber.table_rows_allowed 'doodads' }
+      subject { prof_subscriber.table_setting('doodads').rows_allowed }
       it { should eq PaidUp::Unlimited.to_i }
     end
   end
 
-  context '#table_rows' do
+  context '#table_setting().rows_count' do
     context 'when possessing no rows' do
-      subject { professional_subscriber.table_rows 'doodads' }
+      subject { prof_subscriber.table_setting('doodads').rows_count }
       it { should eq 0 }
     end
     context 'when possessing 3 rows' do
       before do
         3.times do
-          professional_subscriber.doodads.create! name: 'Test Doodad'
+          prof_subscriber.doodads.create! name: 'Test Doodad'
         end
       end
-      subject { professional_subscriber.table_rows 'doodads' }
+      subject { prof_subscriber.table_setting('doodads').rows_count }
       it { should eq 3 }
     end
   end
 
-  context '#rolify_rows_remaining' do
+  context '#rolify_setting().rows_remaining' do
     context 'when using a plan without the feature' do
-      subject { no_ads_subscriber.rolify_rows_remaining 'groups' }
+      subject { no_ads_subscriber.rolify_setting('groups').rows_remaining }
       it { should eq 0 }
     end
     context 'when subscribed to a plan with the feature limited' do
-      subject { group_leader_subscriber.rolify_rows_remaining 'groups' }
+      subject { leader_subscriber.rolify_setting('groups').rows_remaining }
       it { should eq 4 }
     end
     context 'when subscribed to a plan with the feature unlimited' do
-      subject { professional_subscriber.rolify_rows_remaining 'groups' }
+      subject { prof_subscriber.rolify_setting('groups').rows_remaining }
       it { should be > 99_999_999 }
     end
   end
 
-  context '#rolify_rows_unlimited?' do
+  context '#rolify_setting().rows_unlimited?' do
     context 'when using a plan without the feature' do
-      subject { no_ads_subscriber.rolify_rows_unlimited? 'groups' }
+      subject { no_ads_subscriber.rolify_setting('groups').rows_unlimited? }
       it { should eq false }
     end
     context 'when subscribed to a plan with the feature limited' do
-      subject { group_leader_subscriber.rolify_rows_unlimited? 'groups' }
+      subject { leader_subscriber.rolify_setting('groups').rows_unlimited? }
       it { should eq false }
     end
     context 'when subscribed to a plan with the feature unlimited' do
-      subject { professional_subscriber.rolify_rows_unlimited? 'groups' }
+      subject { prof_subscriber.rolify_setting('groups').rows_unlimited? }
       it { should eq true }
     end
   end
 
-  context '#rolify_rows_allowed' do
+  context '#rolify_setting().rows_allowed' do
     context 'when using a plan without the feature' do
-      subject { no_ads_subscriber.rolify_rows_allowed 'groups' }
+      subject { no_ads_subscriber.rolify_setting('groups').rows_allowed }
       it { should eq 0 }
     end
     context 'when subscribed to a plan with the feature limited' do
-      subject { group_leader_subscriber.rolify_rows_allowed 'groups' }
+      subject { leader_subscriber.rolify_setting('groups').rows_allowed }
       it { should eq 5 }
     end
     context 'when subscribed to a plan with the feature unlimited' do
-      subject { professional_subscriber.rolify_rows_allowed 'groups' }
+      subject { prof_subscriber.rolify_setting('groups').rows_allowed }
       it { should eq PaidUp::Unlimited.to_i }
     end
   end
 
-  context '#rolify_rows' do
+  context '#rolify_setting().rows_count' do
     context 'when possessing no rows' do
-      subject { blank_subscriber.rolify_rows 'groups' }
+      subject { blank_subscriber.rolify_setting('groups').rows_count }
       it { should eq 0 }
     end
     context 'when possessing 3 rows' do
@@ -211,7 +213,7 @@ describe User do
           )
         end
       end
-      subject { blank_subscriber.rolify_rows 'groups' }
+      subject { blank_subscriber.rolify_setting('groups').rows_count }
       it { should eq 3 }
     end
   end
@@ -227,28 +229,28 @@ describe User do
     end
   end
 
-  context '#subscription' do
+  context '#paid_up_subscription' do
     context 'when using free plan' do
-      subject { free_subscriber.subscription }
-      it { should be_a Stripe::Subscription }
+      subject { free_subscriber.paid_up_subscription }
+      it { should be_a PaidUp::Subscription }
     end
     context 'when subscribed to a plan' do
-      subject { no_ads_subscriber.subscription }
-      it { should be_a Stripe::Subscription }
+      subject { no_ads_subscriber.paid_up_subscription }
+      it { should be_a PaidUp::Subscription }
     end
   end
 
-  context '#is_subscribed_to?' do
+  context '#subscribed_to?' do
     context 'when using free plan' do
-      subject { free_subscriber.is_subscribed_to? free_plan }
+      subject { free_subscriber.subscribed_to? free_plan }
       it { should be true }
     end
     context 'when true' do
-      subject { professional_subscriber.is_subscribed_to? professional_plan }
+      subject { prof_subscriber.subscribed_to? professional_plan }
       it { should be true }
     end
     context 'when false' do
-      subject { no_ads_subscriber.is_subscribed_to? professional_plan }
+      subject { no_ads_subscriber.subscribed_to? professional_plan }
       it { should be false }
     end
   end
@@ -269,7 +271,7 @@ describe User do
       it { should be true }
     end
     context 'when false' do
-      subject { professional_subscriber.can_upgrade_to? no_ads_plan }
+      subject { prof_subscriber.can_upgrade_to? no_ads_plan }
       it { should be false }
     end
   end
@@ -290,7 +292,7 @@ describe User do
       it { should be false }
     end
     context 'when true' do
-      subject { professional_subscriber.can_downgrade_to? no_ads_plan }
+      subject { prof_subscriber.can_downgrade_to? no_ads_plan }
       it { should be true }
     end
   end
@@ -313,7 +315,7 @@ describe User do
   describe 'Abilities' do
     context 'when anonymous' do
       let(:group) do
-        FactoryGirl.create(:group, owner: professional_subscriber)
+        FactoryGirl.create(:group, owner: prof_subscriber)
       end
       let(:user) { nil }
       subject(:ability) { Ability.new(user) }
@@ -327,7 +329,7 @@ describe User do
     end
     context 'when on free plan' do
       let(:group) do
-        FactoryGirl.create(:group, owner: professional_subscriber)
+        FactoryGirl.create(:group, owner: prof_subscriber)
       end
       let(:user) { free_subscriber }
       subject(:ability) { Ability.new(user) }
@@ -341,16 +343,16 @@ describe User do
     end
     context 'when on group plan' do
       describe 'misc abilities' do
-        let(:user) { group_leader_subscriber }
+        let(:user) { leader_subscriber }
         subject(:ability) { Ability.new(user) }
         it { should be_able_to(:use, :ad_free) }
       end
       describe 'using groups' do
         context 'given no groups are owned' do
           let(:group) do
-            FactoryGirl.create(:group, owner: group_leader_subscriber)
+            FactoryGirl.create(:group, owner: leader_subscriber)
           end
-          let(:user) { group_leader_subscriber }
+          let(:user) { leader_subscriber }
           subject(:ability) { Ability.new(user) }
           it { should be_able_to(:index, group) }
           it { should be_able_to(:show, group) }
@@ -374,9 +376,9 @@ describe User do
       describe 'using doodads' do
         context 'given no doodads are owned' do
           let(:doodad) do
-            FactoryGirl.create(:doodad, user: group_leader_subscriber)
+            FactoryGirl.create(:doodad, user: leader_subscriber)
           end
-          let(:user) { group_leader_subscriber }
+          let(:user) { leader_subscriber }
           subject(:ability) { Ability.new(user) }
           it { should be_able_to(:index, doodad) }
           it { should be_able_to(:show, doodad) }
@@ -400,9 +402,9 @@ describe User do
       describe 'using posts' do
         context 'given no posts are owned' do
           let(:post) do
-            FactoryGirl.create(:post, user: group_leader_subscriber)
+            FactoryGirl.create(:post, user: leader_subscriber)
           end
-          let(:user) { group_leader_subscriber }
+          let(:user) { leader_subscriber }
           subject(:ability) { Ability.new(user) }
           it { should be_able_to(:index, post) }
           it { should be_able_to(:show, post) }
@@ -429,7 +431,7 @@ describe User do
         let(:group) do
           FactoryGirl.create(:group, owner: blank_subscriber)
         end
-        let(:user) { professional_subscriber }
+        let(:user) { prof_subscriber }
         subject(:ability) { Ability.new(user) }
         it { should be_able_to(:index, group) }
         it { should be_able_to(:show, group) }
@@ -441,9 +443,9 @@ describe User do
       end
       context 'given one group is owned' do
         let(:group) do
-          FactoryGirl.create(:group, owner: professional_subscriber)
+          FactoryGirl.create(:group, owner: prof_subscriber)
         end
-        let(:user) { professional_subscriber }
+        let(:user) { prof_subscriber }
         subject(:ability) { Ability.new(user) }
         it { should be_able_to(:index, group) }
         it { should be_able_to(:show, group) }

data/spec/paid_up_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe 'PaidUp' do

data/spec/rails_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'coveralls'
 Coveralls.wear!
 
@@ -7,6 +9,7 @@ require 'spec_helper'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
+require 'rspec/core/formatters/console_codes'
 require 'shoulda/matchers'
 require 'factory_girl_rails'
 require 'capybara/rspec'
@@ -35,6 +38,10 @@ ActiveRecord::Migrator.migrations_paths = 'spec/dummy/db/migrate'
 # If you are not using ActiveRecord, you can remove this line.
 # ActiveRecord::Migration.maintain_test_schema!
 
+# TODO: Add feature specs
+# TODO: Add helper specs
+# TODO: Remove view specs
+
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
@@ -76,8 +83,15 @@ RSpec.configure do |config|
   config.before(:each) { @routes = PaidUp::Engine.routes }
   config.include PaidUp::Engine.routes.url_helpers
 
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :view
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :view
   config.include ControllerMacros, type: :controller
   config.include ControllerMacros, type: :view
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

data/spec/routing/paid_up/plans_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe 'PaidUp::Routing' do

data/spec/routing/paid_up/subscription_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe 'PaidUp::Routing' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by the `rails generate rspec:install` command.
 # Conventionally, all specs live under a `spec` directory, which RSpec adds
 # to the `$LOAD_PATH`. The generated `.rspec` file contains

data/spec/support/controller_macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ControllerMacros
   def access_anonymous
     sign_out :user

data/spec/support/factory_girl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 end

data/spec/support/loaded_site/features.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'features' do
   let!(:ad_free_feature) { PaidUp::Feature.find_by_slug('ad_free') }
   let!(:groups_feature) { PaidUp::Feature.find_by_slug('groups') }

data/spec/support/loaded_site/groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'groups' do
   let(:first_group) { Group.find_by_title('First Group') }
   let(:second_group) { Group.find_by_title('Second Group') }

data/spec/support/loaded_site/loaded_site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'loaded site' do
   include_context 'plans'
   include_context 'features'

data/spec/support/loaded_site/plans.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'plans' do
   let!(:anonymous_plan) { PaidUp::Plan.find_by_stripe_id('anonymous-plan') }
   let!(:free_plan) { PaidUp::Plan.find_by_stripe_id('free-plan') }

data/spec/support/loaded_site/posts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'posts' do
   let(:first_post) { Post.find_by_title('First Post') }
   let(:active_post) { Post.find_by_title('Active Post') }

data/spec/support/loaded_site/users.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 shared_context 'users' do
   let(:free_subscriber) { User.find_by_name('Free Subscriber') }
   let(:no_ads_subscriber) { User.find_by_name('No Ads Subscriber') }
-  let(:group_leader_subscriber) { User.find_by_name('Group Leader Subscriber') }
-  let(:professional_subscriber) { User.find_by_name('Professional Subscriber') }
+  let(:leader_subscriber) { User.find_by_name('Group Leader Subscriber') }
+  let(:prof_subscriber) { User.find_by_name('Professional Subscriber') }
   let(:blank_subscriber) { User.find_by_name('Blank Subscriber') }
   let(:disabling_subscriber) { User.find_by_name('Disabling Subscriber') }
 end

data/spec/support/stripe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'stripe' do
   let(:default_card_data) do
     {

data/spec/views/paid_up/plans_spec.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'paid_up/plans/index' do
   include_context 'loaded site'
 
+  before do
+    view.extend PaidUp::PlansHelper
+    view.extend PaidUp::FeaturesHelper
+    view.extend BootstrapLeatherHelper
+  end
+
   context 'when user is anonymous' do
     before do
-      view.extend PaidUp::PlansHelper
-      view.extend PaidUp::FeaturesHelper
-
       assign(:current_user, access_anonymous)
       assign(:plans, PaidUp::Plan.subscribable)
       render
@@ -29,10 +34,7 @@ RSpec.describe 'paid_up/plans/index' do
 
   context 'when user is logged in as professional subscriber' do
     before do
-      view.extend PaidUp::PlansHelper
-      view.extend PaidUp::FeaturesHelper
-
-      assign(:current_user, login_subscriber(professional_subscriber))
+      assign(:current_user, login_subscriber(prof_subscriber))
       assign(:plans, PaidUp::Plan.subscribable)
       render
     end

data/spec/views/paid_up/subscriptions_spec.rb

@@ -1,13 +1,19 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'paid_up/subscriptions/new' do
   include_context 'loaded site'
+
+  before do
+    view.extend PaidUp::PlansHelper
+    view.extend PaidUp::FeaturesHelper
+    view.extend BootstrapLeatherHelper
+  end
+
   context 'when user is logged in as free customer' do
     context 'displays a payment form' do
       before do
-        view.extend PaidUp::PlansHelper
-        view.extend PaidUp::FeaturesHelper
-
         assign(:current_user, login_subscriber(free_subscriber))
         assign(:plan, professional_plan)
         render
@@ -23,9 +29,6 @@ RSpec.describe 'paid_up/subscriptions/new' do
   context 'when user is logged in as a paid customer' do
     context 'displays a payment form' do
       before do
-        view.extend PaidUp::PlansHelper
-        view.extend PaidUp::FeaturesHelper
-
         assign(:current_user, login_subscriber(no_ads_subscriber))
         assign(:plan, professional_plan)
         render
@@ -42,26 +45,24 @@ end
 
 RSpec.describe 'paid_up/subscriptions/index' do
   include_context 'loaded site'
+
+  before do
+    view.extend PaidUp::PlansHelper
+    view.extend PaidUp::FeaturesHelper
+    view.extend BootstrapLeatherHelper
+  end
+
   context 'when user is logged in' do
     context "displays the details of a user's subscriptions" do
       before do
-        view.extend PaidUp::PlansHelper
-        view.extend PaidUp::FeaturesHelper
-
-        assign(:current_user, login_subscriber(group_leader_subscriber))
+        assign(:current_user, login_subscriber(leader_subscriber))
         render
       end
       subject { rendered }
       it { should include 'Group Leader' }
-      it do
-        should have_selector 'table.abilities #ad_free_ability .glyphicon-ok'
-      end
-      it do
-        should have_selector 'table.abilities #groups_ability .glyphicon-ok'
-      end
-      it do
-        should have_selector 'table.abilities #doodads_ability .glyphicon-ok'
-      end
+      it { should have_css 'table.abilities #ad_free_ability .glyphicon-ok' }
+      it { should have_css 'table.abilities #groups_ability .glyphicon-ok' }
+      it { should have_css 'table.abilities #doodads_ability .glyphicon-ok' }
     end
   end
 end