Testsformaster

.gitignore

@@ -82,3 +82,7 @@ pickle-email-*.html
 
 # tilde files are usually backup files from a text editor
 *~
+
+# StripeMock log
+/stripe-mock-server.log
+/stripe-mock-server.pid

.rspec

@@ -1,4 +1,4 @@
 --color
 --format documentation
 --require spec_helper
---require rails_helper
+--require rails_helper

.rubocop.yml

@@ -0,0 +1,11 @@
+AlignParameters:
+  Enabled: false
+
+Rails:
+  Enabled: true
+
+Metrics/LineLength:
+  Max: 120
+
+Style/Encoding:
+  Enabled: false

.ruby-gemset

@@ -1 +1 @@
-rails-stripe-membership-saas
+rails-stripe-membership-saas

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

Gemfile

@@ -1,36 +1,36 @@
 source 'https://rubygems.org'
-ruby '2.2.3'
-gem 'rails', '4.2.5'
+ruby '2.3.0'
+gem 'rails', '4.2.5.2'
 gem 'sqlite3'
-gem 'sass-rails', '~> 5.0'
-gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.1.0'
-gem 'jquery-rails'
-gem 'jbuilder', '~> 2.0'
-group :development, :test do
-  gem 'byebug'
-end
-group :development do
-  gem 'web-console', '~> 2.0'
-  gem 'spring'
-end
 gem 'bootstrap-sass'
+gem 'coffee-rails', '~> 4.1.0'
 gem 'devise'
-gem 'gibbon'
+gem 'gibbon', '~> 2.2', '>= 2.2.1'
 gem 'high_voltage'
+gem 'jquery-rails'
+gem 'jbuilder', '~> 2.0'
 gem 'payola-payments'
+gem 'sass-rails', '~> 5.0'
 gem 'sucker_punch'
+gem 'uglifier', '>= 1.3.0'
 group :development do
   gem 'better_errors'
   gem 'quiet_assets'
   gem 'rails_layout'
   gem 'spring-commands-rspec'
+  gem 'web-console', '~> 3.0'
 end
 group :development, :test do
+  gem 'byebug'
   gem 'factory_girl_rails'
   gem 'faker'
+  gem 'pry'
   gem 'rspec-rails'
-  gem 'stripe-ruby-mock', '~> 2.1.1', :require => 'stripe_mock'
+  gem 'rubocop', require: false
+  gem 'spring'
+  # gem 'stripe-ruby-mock', '~> 2.2.0', require: 'stripe_mock'
+  gem 'stripe-ruby-mock', git: 'https://github.com/rebelidealist/stripe-ruby-mock.git', branch: 'master', require: 'stripe_mock'
+  gem 'thin', '~> 1.6.3'
 end
 group :test do
   gem 'capybara'