@@ -10,10 +10,10 @@ model_template: test_template: type: file template_path: <%= File.join(templates_directory_path, "test.rb.template") %> - output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %> + output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_test.rb") %> <% elsif testing_framework == "rspec" %> test_template: type: file template_path: <%= File.join(templates_directory_path, "rspec.rb.template") %> - output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_spec.rb") %> + output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_spec.rb") %> <% end %> \ No newline at end of file mack-active_record/lib/mack-active_record/model_generator/manifest.yml @@ -22,10 +22,10 @@ show_template: functional_test_template: type: file template_path: <%= File.join(templates_directory_path, "test.rb.template") %> - output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_test.rb") %> + output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_test.rb") %> <% elsif @test_framework == "rspec" -%> functional_test_template: type: file template_path: <%= File.join(templates_directory_path, "spec.rb.template") %> - output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_spec.rb") %> + output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_spec.rb") %> <% end -%> \ No newline at end of file mack-active_record/lib/mack-active_record/scaffold_generator/manifest.yml @@ -6,7 +6,7 @@ describe ModelGenerator do before(:each) do @model_file = File.join(Mack.root, "app", "models", "zoo.rb") @mig_file = File.join(Mack.root, "db", "migrations", "002_create_zoos.rb") - @test_file = File.join(Mack.root, "test", "unit", "zoo_test.rb") + @test_file = File.join(Mack.root, "test", "models", "zoo_test.rb") end after(:each) do @@ -36,7 +36,7 @@ describe ModelGenerator do it "should create a stub rspec test for the model if rspec is testing framework" do temp_app_config("mack::testing_framework" => "rspec") do - @test_file = File.join(Mack.root, "test", "unit", "zoo_spec.rb") + @test_file = File.join(Mack.root, "test", "models", "zoo_spec.rb") ModelGenerator.run("NAME" => "zoo") File.exists?(@test_file).should == true end mack-active_record/spec/lib/model_generator_spec.rb @@ -15,8 +15,8 @@ describe ScaffoldGenerator do @model_file = File.join(@model_path, "zoo.rb") @mig_file = File.join(migrations_directory, "#{next_migration_number}_create_zoos.rb") - @cont_test_file = File.join(Mack.root, "test", "functional", "zoos_controller_test.rb") - @model_test_file = File.join(Mack.root, "test", "unit", "zoo_test.rb") + @cont_test_file = File.join(Mack.root, "test", "controllers", "zoos_controller_test.rb") + @model_test_file = File.join(Mack.root, "test", "models", "zoo_test.rb") @routes_file = File.join(Mack.root, "config", "routes.rb") @orig_routes_content = File.read(@routes_file) @@ -66,8 +66,8 @@ describe ScaffoldGenerator do it "should create a stub rspec test for the controller if rspec is testing framework" do temp_app_config("mack::testing_framework" => "rspec") do ScaffoldGenerator.run("NAME" => "zoo") - @cont_test_file = File.join(Mack.root, "test", "functional", "zoos_controller_spec.rb") - @model_test_file = File.join(Mack.root, "test", "unit", "zoo_spec.rb") + @cont_test_file = File.join(Mack.root, "test", "controllers", "zoos_controller_spec.rb") + @model_test_file = File.join(Mack.root, "test", "models", "zoo_spec.rb") File.exists?(@cont_test_file).should == true end end mack-active_record/spec/lib/scaffold_generator_spec.rb e76cbe792ed499a42fce906de3ad7638c2d307d8 Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/3b331aaa95e797c390d8bd41422ee4cb3dced130 3b331aaa95e797c390d8bd41422ee4cb3dced130 2008-08-04T12:16:47-07:00 2008-08-04T12:16:47-07:00 mack-active_record no longer uses functional and unit test directories. [#73 state:resolved] 5485a0872ab92f9c0000e0b0cb800e97368baeaf Mark Bates mark@markbates.com