Permalink
Browse files

Merge branch 'rake'

Conflicts:

	Manifest.txt
  • Loading branch information...
2 parents c0505af + d481b67 commit c8608bb9b70a7807335916b1782d9b8aa25972d0 @avh4 avh4 committed Jul 5, 2008
View
@@ -30,7 +30,7 @@ rbiphonetest_generators/story/templates/steps.rb
rbiphonetest_generators/story/templates/story
rbiphonetest_generators/story/templates/story.rb
rbiphonetest_generators/story/templates/story_helper.rb
-rbiphonetest_generators/model/templates/test_unit.rake
+rbiphonetest_generators/model/templates/tasks/test_unit.rake
script/console
script/destroy
script/generate
@@ -10,8 +10,6 @@ end
task :compile => "objc:compile"
-task :test => :compile
-
namespace :objc do
# look for Classes/*.m files containing a line "void Init_ClassName"
# These are the primary classes for bundles; make a bundle for each
@@ -23,7 +23,7 @@ def manifest
m.template "model.h", "Classes/#{class_name}.h"
m.template "model.m", "Classes/#{class_name}.m"
m.template "test.rb", "test/test_#{name}.rb"
- m.file "test_unit.rake", "tasks/test_unit.rake"
+ m.file_copy_each ["tasks/test_unit.rake"]
end
end
@@ -2,6 +2,8 @@ require "rake/testtask"
task :default => :test
+task :test => :compile
+
Rake::TestTask.new do |t|
t.libs << "test" << "test/bundles"
t.test_files = FileList['test/test*.rb']

0 comments on commit c8608bb

Please sign in to comment.