Fix hanami generate model when the given name is CamelCase

hanami · Feb 24, 2016 · 11a3bc6 · 11a3bc6
1 parent 602ebee
commit 11a3bc6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/test/application_name_test.rb b/test/application_name_test.rb
@@ -18,11 +18,6 @@
         application_name = Hanami::ApplicationName.new('my app')
         application_name.to_s.must_equal 'my_app'
       end
-
-      it 'renders with underscores de-duplicated' do
-        application_name = Hanami::ApplicationName.new('my _app')
-        application_name.to_s.must_equal 'my_app'
-      end
     end
 
     describe '#to_env_s' do

diff --git a/test/commands/generate/model_test.rb b/test/commands/generate/model_test.rb
@@ -25,12 +25,12 @@
     end
   end
 
-  describe 'sanitizes model name' do
-    it 'downcases it' do
+  describe 'with CamelCase model name' do
+    it 'underscores it' do
       with_temp_dir do |original_wd|
-        command = Hanami::Commands::Generate::Model.new({}, 'CaR')
+        command = Hanami::Commands::Generate::Model.new({}, 'BrokenCar')
         capture_io { command.start }
-        assert_generated_file(original_wd.join('test/fixtures/commands/generate/model/car.rb'), 'lib/test_app/entities/car.rb')
+        assert_generated_file(original_wd.join('test/fixtures/commands/generate/model/broken_car.rb'), 'lib/test_app/entities/broken_car.rb')
       end
     end
   end

diff --git a/test/commands/new/container_test.rb b/test/commands/new/container_test.rb
@@ -52,11 +52,11 @@
   end
 
   describe 'with valid arguments' do
-    it 'application name with dash' do
+    it 'project name with dash' do
       with_temp_dir do |original_wd|
         command = Hanami::Commands::New::Container.new({}, 'new-container')
         capture_io { command.start }
-        Dir.chdir('new-container') do
+        Dir.chdir('new_container') do
           actual_content = File.read('.env.development')
           actual_content.must_include 'DATABASE_URL="file:///db/new_container_development"'
 
@@ -66,12 +66,12 @@
       end
     end
 
-    describe 'application name is a point' do
+    describe 'project name is a point' do
       it 'generates application in current folder' do
         with_temp_dir do |original_wd|
-         command = Hanami::Commands::New::Container.new({}, '.')
+          command = Hanami::Commands::New::Container.new({}, '.')
           capture_io { command.start }
-          Dir.chdir('.') do
+          Dir.chdir('test_app') do
             actual_content = File.read('.env.development')
             actual_content.must_include 'DATABASE_URL="file:///db/test_app_development"'
 

diff --git a/test/fixtures/commands/generate/model/broken_car.rb b/test/fixtures/commands/generate/model/broken_car.rb
@@ -0,0 +1,3 @@
+class BrokenCar
+  include Hanami::Entity
+end