From e4f943d64755c176bb09bfd2a7deed33c15d874a Mon Sep 17 00:00:00 2001
From: Takeshi Yabe <tyabe@nilidea.com>
Date: Sun, 29 Jun 2014 21:10:46 +0900
Subject: [PATCH 1/2] [padrino-gen] Adjust to RSpec3, and little fix

to the rake task:
* remove the formatting option
* add description to dynamic tasks
* using 'each_with_object' instead of 'inject'

to the templates:
* adjust to RSpec3 syntax
* set to be pending in the initial state
---
 .../generators/components/tests/rspec.rb      | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb b/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
index c9b0d625b..0c3752db8 100644
--- a/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
+++ b/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
@@ -24,13 +24,15 @@ def app(app = nil, &blk)
 RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_CONTROLLER_TEST)
 require 'spec_helper'
 
-describe "!NAME!Controller" do
-  before do
-    get "/"
-  end
+RSpec.describe "!NAME!Controller" do
+  pending "add some examples to \#{__FILE__}" do
+    before do
+      get "/"
+    end
 
-  it "returns hello world" do
-    last_response.body.should == "Hello World"
+    it "http status code to be ok" do
+      expect(last_response).to be_ok
+    end
   end
 end
 TEST
@@ -39,15 +41,15 @@ def app(app = nil, &blk)
 begin
   require 'rspec/core/rake_task'
 
-  spec_tasks = Dir['spec/*/'].inject([]) do |result, d|
+  spec_tasks = Dir['spec/*/'].each_with_object([]) do |d, result|
     result << File.basename(d) unless Dir["\#{d}*"].empty?
-    result
   end
 
   spec_tasks.each do |folder|
+    desc "Run the spec suite in \#{folder}"
     RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|
       t.pattern = "./spec/\#{folder}/**/*_spec.rb"
-      t.rspec_opts = %w(-fs --color)
+      t.rspec_opts = "--color"
     end
   end
 
@@ -61,20 +63,23 @@ def app(app = nil, &blk)
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
 require 'spec_helper'
 
-describe !NAME! do
+RSpec.describe !NAME! do
+  pending "add some examples to (or delete) \#{__FILE__}"
 end
 TEST
 
 RSPEC_HELPER_TEST = (<<-TEST) unless defined?(RSPEC_HELPER_TEST)
 require 'spec_helper'
 
-describe "!NAME!" do
-  let(:helpers){ Class.new }
-  before { helpers.extend !NAME! }
-  subject { helpers }
+RSpec.describe "!NAME!" do
+  pending "add some examples to (or delete) \#{__FILE__}" do
+    let(:helpers){ Class.new }
+    before { helpers.extend !NAME! }
+    subject { helpers }
 
-  it "should return nil" do
-    expect(subject.foo).to be_nil
+    it "should return nil" do
+      expect(subject.foo).to be_nil
+    end
   end
 end
 TEST

From 7b5add8deb0ae9fe8659dbd8388121ec21999a32 Mon Sep 17 00:00:00 2001
From: Takeshi Yabe <tyabe@nilidea.com>
Date: Mon, 30 Jun 2014 21:01:27 +0900
Subject: [PATCH 2/2] Restore controller default test case in rspec template

---
 .../lib/padrino-gen/generators/components/tests/rspec.rb      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb b/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
index 0c3752db8..b9a2461ef 100644
--- a/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
+++ b/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
@@ -30,8 +30,8 @@ def app(app = nil, &blk)
       get "/"
     end
 
-    it "http status code to be ok" do
-      expect(last_response).to be_ok
+    it "returns hello world" do
+      expect(last_response.body).to eq "Hello World"
     end
   end
 end