Skip to content

Commit

Permalink
Merge pull request #6 from naofumi-fujii/require-rails-helper
Browse files Browse the repository at this point in the history
require rails_helper instead of spec_helper
  • Loading branch information
seratch committed Jan 7, 2016
2 parents 2ba470b + aecb840 commit f5413b8
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 31 deletions.
79 changes: 51 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ GEM
astrolabe (1.3.1)
parser (~> 2.2)
coderay (1.1.0)
colorize (0.5.8)
coveralls (0.6.7)
colorize
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
thor
diff-lcs (1.2.4)
coveralls (0.8.10)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.11.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
ffi (1.9.10)
ffi (1.9.10-java)
formatador (0.2.5)
Expand All @@ -29,20 +32,26 @@ GEM
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-rspec (4.3.1)
guard-compat (1.2.1)
guard-rspec (4.6.4)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
guard-rubocop (1.2.0)
guard (~> 2.0)
rubocop (~> 0.20)
http-cookie (1.0.2)
domain_name (~> 0.5)
json (1.8.3)
json (1.8.3-java)
listen (3.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.10)
method_source (0.8.2)
mime-types (1.23)
multi_json (1.7.7)
mime-types (2.99)
nenv (0.2.0)
netrc (0.11.0)
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
Expand All @@ -62,16 +71,23 @@ GEM
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.4)
rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.2)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rubocop (0.35.1)
astrolabe (~> 1.3)
parser (>= 2.2.3.0, < 3.0)
Expand All @@ -81,15 +97,22 @@ GEM
tins (<= 1.6.0)
ruby-progressbar (1.7.5)
shellany (0.0.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
simplecov (0.11.1)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spoon (0.0.4)
ffi
thor (0.18.1)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.1)
tins (1.6.0)
unf (0.1.4)
unf_ext
unf (0.1.4-java)
unf_ext (0.0.7.1)

PLATFORMS
java
Expand All @@ -105,4 +128,4 @@ DEPENDENCIES
simplecov

BUNDLED WITH
1.10.6
1.11.2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Output for scaffold:
```ruby
# -*- encoding: utf-8 -*-

require 'spec_helper'
require 'rails_helper'

describe CommentsController do

Expand Down
4 changes: 2 additions & 2 deletions lib/rspec_kickstarter/erb_templates.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module ERBTemplates
RAILS_CONTROLLER_NEW_SPEC_TEMPLATE = <<SPEC
# -*- encoding: utf-8 -*-
require 'spec_helper'
require 'rails_helper'
describe <%= get_complete_class_name(c) %> do
<%= ERB.new(RAILS_CONTROLLER_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
Expand All @@ -72,7 +72,7 @@ module ERBTemplates
RAILS_HELPER_NEW_SPEC_TEMPLATE = <<SPEC
# -*- encoding: utf-8 -*-
require 'spec_helper'
require 'rails_helper'
describe <%= get_complete_class_name(c) %> do
<%= ERB.new(RAILS_HELPER_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
Expand Down

0 comments on commit f5413b8

Please sign in to comment.