test_generator.rb in ripple-1.0.0.beta

- old
+ new
@@ -1,50 +1,38 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
 require 'rails/generators/ripple_generator'
 
 module Ripple
   module Generators
     class TestGenerator < Base
       desc 'Generates test helpers for Ripple. Test::Unit, RSpec and Cucumber are supported.'
       # Cucumber
       def create_cucumber_file
         if File.directory?(Rails.root + "features/support")
-          template 'test_server.rb', 'features/support/ripple.rb'
           insert_into_file 'features/support/ripple.rb', "\n\nAfter do\n  Ripple::TestServer.clear\nend", :after => "Ripple::TestServer.setup"
         end
       end
 
       # RSpec
       def create_rspec_file
         if File.file?(Rails.root + 'spec/spec_helper.rb')
-          template 'test_server.rb', 'spec/support/ripple.rb'
+          inject_into_file 'spec/spec_helper.rb', :before => /R[Ss]pec\.configure do \|config\|/ do
+            "require 'ripple/test_server'\n"
+          end
           inject_into_file 'spec/spec_helper.rb', :after => /R[Ss]pec\.configure do \|config\|/ do
-            "\n  config.after(:each) do\n    Ripple::TestServer.clear\n  end\n"
+            "\n  config.before(:all){ Ripple::TestServer.setup }" +
+            "\n  config.after(:each){ Ripple::TestServer.clear }\n"
           end
         end
       end
 
       # Test::Unit
       def create_test_unit_file
         if File.file?(Rails.root + 'test/test_helper.rb')
-          template 'test_server.rb', 'test/ripple_test_helper.rb'
           inject_into_file "test/test_helper.rb", :before => "class ActiveSupport::TestCase" do
-            "# Setup in-memory test server for Riak\nrequire File.expand_path('../ripple_test_helper.rb', __FILE__)\n\n"
+            "# Setup in-memory test server for Riak\nrequire 'ripple/test_server'\n\n"
           end
           inject_into_class "test/test_helper.rb", ActiveSupport::TestCase do
-            "  teardown { Ripple::TestServer.clear }\n\n"
+            "  setup { Ripple::TestServer.setup }\n  teardown { Ripple::TestServer.clear }\n\n"
           end
         end
       end
     end
   end