Skip to content
This repository has been archived by the owner on Jun 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #15 from khusnetdinov/update_ruby
Browse files Browse the repository at this point in the history
Update ruby
  • Loading branch information
khusnetdinov authored Dec 29, 2017
2 parents afceca9 + b484018 commit 4d4c914
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.5.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: ruby
rvm:
- 2.3.1
- 2.5.0
gemfile:
- Gemfile
before_install:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ It includes development gems:
It includes tests gems:
- [Capybara](https://github.com/jnicklas/capybara) [API EXCLUDED] helps you test web applications by simulating how a real user would interact with your app.
- [Database Cleaner](https://github.com/DatabaseCleaner/database_cleaner) is a set of strategies for cleaning your database in Ruby.
- [Factory Girl](https://github.com/thoughtbot/factory_girl) is a fixtures replacement with a straightforward definition syntax.
- [Factory Bot](https://github.com/thoughtbot/factory_bot) is a fixtures replacement with a straightforward definition syntax.
- [Faker](https://github.com/stympy/faker) a port of Perl's Data::Faker library that generates fake data.
- [Formulaic](https://github.com/thoughtbot/formulaic) [API EXCLUDED] the tedium of formulaic form filling with Capybara.
- [I18n-Tasks](https://github.com/glebm/i18n-tasks) [API EXCLUDED] Gem that helps manage locales and test if are there problems.
Expand Down
4 changes: 2 additions & 2 deletions lib/kazan/app_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ def spec_shoulda_matchers_config
copy_file 'shoulda_matchers.rb', 'spec/support/shoulda_matchers.rb'
end

def spec_factory_girl_config
copy_file 'factory_girl.rb', 'spec/support/factory_girl.rb'
def spec_factory_bot_config
copy_file 'factory_bot.rb', 'spec/support/factory_bot.rb'
end

def rspec_config
Expand Down
2 changes: 1 addition & 1 deletion lib/kazan/generators/app_generator.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'rails/generators'
require 'rails/generators/rails/app/app_generator'

require 'rails/generators/rails/app/app_generator'
module Kazan
class AppGenerator < Rails::Generators::AppGenerator
hide!
Expand Down
2 changes: 1 addition & 1 deletion lib/kazan/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Kazan
VERSION = '0.4.0'.freeze
VERSION = '0.5.0'.freeze
RAILS_VERSION = '~> 5.0.0'.freeze
RUBY_PROJECT_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip.freeze
end
2 changes: 1 addition & 1 deletion spec/project_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
'config',
'database_cleaner',
'dotenv',
'factory_girl_rails',
'factory_bot_rails',
'faker',
'flutie',
'foreman',
Expand Down
6 changes: 3 additions & 3 deletions templates/Gemfile.api.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ source "https://rubygems.org"
ruby "<%= Kazan::RUBY_PROJECT_VERSION %>"

gem 'rails', "<%= Kazan::RAILS_VERSION %>"
gem 'rails-i18n'
gem 'rails-i18n', '~> 5.0.0'
gem 'dotenv-rails'
gem 'config'

gem 'pg'


gem 'rollbar'

gem 'puma'
Expand All @@ -28,7 +28,7 @@ group :development, :test do
gem 'bullet'
gem 'bundler-audit', '>= 0.5.0', require: false
gem 'faker'
gem 'factory_girl_rails'
gem 'factory_bot_rails'
gem 'pry-byebug'
gem 'pry-rails'
gem 'rspec-rails', '~> 3.5.0.beta4'
Expand Down
4 changes: 2 additions & 2 deletions templates/Gemfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby "<%= Kazan::RUBY_PROJECT_VERSION %>"

gem 'rails', "<%= Kazan::RAILS_VERSION %>"
gem 'rails-i18n'
gem 'rails-i18n', '~> 5.0.0'
gem 'dotenv-rails'
gem 'config'

Expand Down Expand Up @@ -41,7 +41,7 @@ group :development, :test do
gem 'bullet'
gem 'bundler-audit', '>= 0.5.0', require: false
gem 'faker'
gem 'factory_girl_rails'
gem 'factory_bot_rails'
gem 'pry-byebug'
gem 'pry-rails'
gem 'rspec-rails', '~> 3.5.0.beta4'
Expand Down
3 changes: 3 additions & 0 deletions templates/factory_bot.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
RSpec.configure do |config|
config.include FactoryBot::Syntax::Methods
end
3 changes: 0 additions & 3 deletions templates/factory_girl.rb

This file was deleted.

0 comments on commit 4d4c914

Please sign in to comment.