test/generator.rb in nephos-server-0.4.8 vs test/generator.rb in nephos-server-0.5.0

@@ -1,50 +1,57 @@
 class TestNephosServerGenerator < Test::Unit::TestCase
 
   def test_generator_application
-    # Dir.chdir("/tmp")
-    # name = Time.now.to_i.to_s
-    # `nephos-server a #{name}`
+    `rm -rf /tmp/nephos-server-test 2> /tmp/null`
+
+    `./bin/nephos-generator -a /tmp/nephos-server-test --no-build --no-git`
+    assert(Dir.exists? "/tmp/nephos-server-test")
+    assert(File.exists? "/tmp/nephos-server-test/Gemfile")
+    assert(File.exists? "/tmp/nephos-server-test/routes.rb")
+    assert(Dir.exists? "/tmp/nephos-server-test/app")
+    gemfile_data = File.read("/tmp/nephos-server-test/Gemfile").split("\n")
+    assert(gemfile_data.include? "gem 'nephos-server'")
+    `rm -rf /tmp/nephos-server-test 2> /tmp/null`
   end
 
   def test_generator_controller
     `rm -f app/test_controller.rb`
 
-    `nephos-generator --debug c test`
+    `./bin/nephos-generator --test -c test`
     assert File.exists? "app/test_controller.rb"
     assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
     `rm -f app/test_controller.rb`
 
-    `nephos-generator c test --debug`
+    `./bin/nephos-generator -c test --test`
     assert File.exists? "app/test_controller.rb"
     assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
     `rm -f app/test_controller.rb`
 
-      `nephos-generator c testController --debug`
+    `./bin/nephos-generator -c testController --test`
     assert File.exists? "app/test_controller.rb"
     assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
     `rm -f app/test_controller.rb`
   end
 
   # test simple and rm
   def test_generator_route1
     s1 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr#mth`
+    `./bin/nephos-generator --test -r get test ctr#mth`
     s2 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr#mth --rm`
+    `./bin/nephos-generator --test -r get test ctr#mth --rm`
     s3 = File.read("routes.rb")
     assert_equal s1, s3
     assert_not_equal s1, s2
   end
 
   # test if ctr#mth == ctr mth
   def test_generator_route2
     s1 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr#mth`
+    `./bin/nephos-generator --test -r get test ctr#mth`
     s2 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr mth`
+    `./bin/nephos-generator --test -r get test ctr mth`
     s3 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr mth --rm`
+    `./bin/nephos-generator --test -r get test ctr mth --rm`
     s4 = File.read("routes.rb")
     assert_equal s2, s3
     assert_equal s1, s4
   end