Small rspec test folder fix. Bumping up to 0.3.2

grimen · Sep 9, 2009 · 4521e75 · 4521e75
1 parent cc7da7b
commit 4521e75
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/VERSION.yml b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 1
+:patch: 2
 :major: 0
diff --git a/dry_scaffold.gemspec b/dry_scaffold.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dry_scaffold}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonas Grimfelt"]

diff --git a/generators/dry_model/dry_model_generator.rb b/generators/dry_model/dry_model_generator.rb
@@ -60,7 +60,7 @@ def manifest
 
       # Model Tests.
       unless options[:skip_tests]
-        model_tests_path = File.join(TEST_PATHS[test_framework], 'unit')
+        model_tests_path = File.join(TEST_PATHS[test_framework], UNIT_TESTS_PATH[test_framework])
         m.directory File.join(model_tests_path, class_path)
         m.template File.join('models', 'tests', "#{test_framework}", 'unit_test.rb'),
           File.join(model_tests_path, class_path, "#{file_name}_test.rb")

diff --git a/generators/dry_model/templates/models/tests/rspec/unit_test.rb b/generators/dry_model/templates/models/tests/rspec/unit_test.rb
@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe <%= class_name %> do
-  <% if options[:fixtures] -%>
-    fixtures :<%= table_name %>
+<% if options[:fixtures] -%>
+  fixtures :<%= table_name %>
 
-  <% end -%>
+<% end -%>
   it "should be valid" do
     Comment.new.should be_valid
   end

diff --git a/generators/dry_scaffold/dry_scaffold_generator.rb b/generators/dry_scaffold/dry_scaffold_generator.rb
@@ -142,7 +142,7 @@ def manifest
 
       # Controller Tests.
       unless options[:skip_tests]
-        controller_tests_path = File.join(TEST_PATHS[test_framework], 'functional')
+        controller_tests_path = File.join(TEST_PATHS[test_framework], FUNCTIONAL_TESTS_PATH[test_framework])
         m.directory File.join(controller_tests_path, controller_class_path)
         m.template File.join('controllers', 'tests', "#{test_framework}", 'functional_test.rb'),
           File.join(controller_tests_path, controller_class_path, "#{controller_file_name}_controller_test.rb")

diff --git a/lib/dry_generator.rb b/lib/dry_generator.rb
@@ -63,8 +63,16 @@ class DryGenerator < Rails::Generator::NamedBase
   DEFAULT_FACTORY_FRAMEWORK =   :fixtures
 
   TESTS_PATH =                  File.join('test').freeze
-  FUNCTIONAL_TESTS_PATH =       File.join(TESTS_PATH, 'functional').freeze
-  UNIT_TESTS_PATH =             File.join(TESTS_PATH, 'unit').freeze
+  FUNCTIONAL_TESTS_PATH =       {
+    :test       => 'functional',
+    :shoulda    => 'functional',
+    :rspec      => 'controllers'
+  }
+  UNIT_TESTS_PATH =  {
+    :test       => 'unit',
+    :shoulda    => 'unit',
+    :rspec      => 'models',
+  }
 
   NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze