comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/models/site_test.rb

@@ -1,7 +1,11 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class CmsSiteTest < ActiveSupport::TestCase
 
+  setup do
+    @site = comfy_cms_sites(:default)
+  end
+
   def test_fixtures_validity
     Comfy::Cms::Site.all.each do |site|
       assert site.valid?, site.errors.inspect
@@ -13,82 +17,90 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert site.invalid?
     assert_has_errors_on site, [:identifier, :label, :hostname]
 
-    site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'http://site.host')
+    site = Comfy::Cms::Site.new(identifier: "test", hostname: "http://site.host")
     assert site.invalid?
     assert_has_errors_on site, :hostname
 
-    site = Comfy::Cms::Site.new(:identifier => comfy_cms_sites(:default).identifier, :hostname => 'site.host')
+    site = Comfy::Cms::Site.new(identifier: @site.identifier, hostname: "site.host")
     assert site.invalid?
     assert_has_errors_on site, :identifier
 
-    site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'site.host')
+    site = Comfy::Cms::Site.new(identifier: "test", hostname: "site.host")
     assert site.valid?, site.errors.inspect
 
-    site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'localhost:3000')
+    site = Comfy::Cms::Site.new(identifier: "test", hostname: "localhost:3000")
     assert site.valid?, site.errors.inspect
   end
 
   def test_validation_path_uniqueness
-    s1 = comfy_cms_sites(:default)
+    s1 = @site
     s2 = Comfy::Cms::Site.new(
-      :identifier => 'test',
-      :hostname   => s1.hostname,
-      :path       => s1.path
+      identifier: "test",
+      hostname:   s1.hostname,
+      path:       s1.path
     )
     assert s2.invalid?
     assert_has_errors_on s2, :hostname
 
     s2 = Comfy::Cms::Site.new(
-      :identifier => 'test',
-      :hostname   => s1.hostname,
-      :path       => '/en'
+      identifier: "test",
+      hostname:   s1.hostname,
+      path:       "/en"
     )
     assert s2.valid?
   end
 
   def test_identifier_assignment
-    site = Comfy::Cms::Site.new(:hostname => 'my-site.host')
+    site = Comfy::Cms::Site.new(hostname: "my-site.host")
     assert site.valid?
-    assert_equal 'my-site-host', site.identifier
+    assert_equal "my-site-host", site.identifier
   end
 
   def test_hostname_assignment
-    site = Comfy::Cms::Site.new(:identifier => 'test-site')
+    site = Comfy::Cms::Site.new(identifier: "test-site")
     assert site.valid?
-    assert_equal 'test-site', site.hostname
+    assert_equal "test-site", site.hostname
   end
 
   def test_label_assignment
-    site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'my-site.host')
+    site = Comfy::Cms::Site.new(identifier: "test", hostname: "my-site.host")
     assert site.valid?
-    assert_equal 'Test', site.label
+    assert_equal "Test", site.label
   end
 
   def test_clean_path
-    site = Comfy::Cms::Site.create!(:identifier => 'test_a', :hostname => 'test.host', :path => '/en///test//')
-    assert_equal '/en/test', site.path
+    site = Comfy::Cms::Site.create!(
+      identifier: "test_a",
+      hostname:   "test.host",
+      path:       "/en///test//"
+    )
+    assert_equal "/en/test", site.path
 
-    site = Comfy::Cms::Site.create!(:identifier => 'test_b', :hostname => 'my-site.host', :path => '/')
-    assert_equal '', site.path
+    site = Comfy::Cms::Site.create!(
+      identifier: "test_b",
+      hostname:   "my-site.host",
+      path:       "/"
+    )
+    assert_nil site.path
   end
 
   def test_creation
-    assert_difference 'Comfy::Cms::Site.count' do
+    assert_difference "Comfy::Cms::Site.count" do
       Comfy::Cms::Site.create!(
-        :identifier => 'test',
-        :label      => 'Test Site',
-        :hostname   => 'test.test'
+        identifier: "test",
+        label:      "Test Site",
+        hostname:   "test.test"
       )
     end
   end
 
   def test_cascading_destroy
-    assert_difference 'Comfy::Cms::Site.count', -1 do
-      assert_difference 'Comfy::Cms::Layout.count', -3 do
-        assert_difference 'Comfy::Cms::Page.count', -2 do
-          assert_difference 'Comfy::Cms::Snippet.count', -1 do
-            assert_difference 'Comfy::Cms::Category.count', -1 do
-              comfy_cms_sites(:default).destroy
+    assert_difference "Comfy::Cms::Site.count", -1 do
+      assert_difference "Comfy::Cms::Layout.count", -3 do
+        assert_difference "Comfy::Cms::Page.count", -2 do
+          assert_difference "Comfy::Cms::Snippet.count", -1 do
+            assert_difference "Comfy::Cms::Category.count", -1 do
+              @site.destroy
             end
           end
         end
@@ -96,83 +108,82 @@ class CmsSiteTest < ActiveSupport::TestCase
     end
   end
 
-  def test_scope_mirrored
-    site = comfy_cms_sites(:default)
-    assert !site.is_mirrored
-    assert_equal 0, Comfy::Cms::Site.mirrored.count
-    site.update_columns(:is_mirrored => true)
-    assert_equal 1, Comfy::Cms::Site.mirrored.count
-  end
-
   def test_find_site
-    site_a = comfy_cms_sites(:default)
-    assert_equal 'test.host', site_a.hostname
+    site_a = @site
+    assert_equal "test.host", site_a.hostname
     assert_nil site_a.path
 
-    assert_equal site_a, Comfy::Cms::Site.find_site('test.host')
-    assert_equal site_a, Comfy::Cms::Site.find_site('test.host', '/some/path')
-    assert_equal site_a, Comfy::Cms::Site.find_site('test99.host', '/some/path')
+    assert_equal site_a, Comfy::Cms::Site.find_site("test.host")
+    assert_equal site_a, Comfy::Cms::Site.find_site("test.host", "/some/path")
+    assert_equal site_a, Comfy::Cms::Site.find_site("test99.host", "/some/path")
 
-    site_b = Comfy::Cms::Site.create!(:identifier => 'test_a', :hostname => 'test2.host', :path => 'en')
-    site_c = Comfy::Cms::Site.create!(:identifier => 'test_b', :hostname => 'test2.host', :path => 'fr')
+    site_b = Comfy::Cms::Site.create!(identifier: "test_a", hostname: "test2.host", path: "en")
+    site_c = Comfy::Cms::Site.create!(identifier: "test_b", hostname: "test2.host", path: "fr")
 
-    assert_equal site_a,  Comfy::Cms::Site.find_site('test.host')
-    assert_equal site_a,  Comfy::Cms::Site.find_site('test.host', '/some/path')
-    assert_equal site_a,  Comfy::Cms::Site.find_site('test.host', '/some/path')
-    assert_nil            Comfy::Cms::Site.find_site('test99.host', '/some/path')
+    assert_equal site_a,  Comfy::Cms::Site.find_site("test.host")
+    assert_equal site_a,  Comfy::Cms::Site.find_site("test.host", "/some/path")
+    assert_equal site_a,  Comfy::Cms::Site.find_site("test.host", "/some/path")
+    assert_nil            Comfy::Cms::Site.find_site("test99.host", "/some/path")
 
-    assert_nil            Comfy::Cms::Site.find_site('test2.host')
-    assert_nil            Comfy::Cms::Site.find_site('test2.host', '/some/path')
-    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en')
-    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en?a=b')
-    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en/some/path?a=b')
+    assert_nil            Comfy::Cms::Site.find_site("test2.host")
+    assert_nil            Comfy::Cms::Site.find_site("test2.host", "/some/path")
+    assert_equal site_b,  Comfy::Cms::Site.find_site("test2.host", "/en")
+    assert_equal site_b,  Comfy::Cms::Site.find_site("test2.host", "/en?a=b")
+    assert_equal site_b,  Comfy::Cms::Site.find_site("test2.host", "/en/some/path?a=b")
 
-    assert_nil            Comfy::Cms::Site.find_site('test2.host', '/english/some/path')
+    assert_nil            Comfy::Cms::Site.find_site("test2.host", "/english/some/path")
 
-    assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr')
-    assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr?a=b')
-    assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr/some/path')
-    assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr/some/path?a=b')
+    assert_equal site_c,  Comfy::Cms::Site.find_site("test2.host", "/fr")
+    assert_equal site_c,  Comfy::Cms::Site.find_site("test2.host", "/fr?a=b")
+    assert_equal site_c,  Comfy::Cms::Site.find_site("test2.host", "/fr/some/path")
+    assert_equal site_c,  Comfy::Cms::Site.find_site("test2.host", "/fr/some/path?a=b")
   end
 
-  def find_site_with_base_path
-    base_path = '/base_path'
-    ComfortableMexicanSofa.configuration.public_cms_path = base_path
-    site_d = Comfy::Cms::Site.create!(:identifier => 'test_d', :hostname => 'test3.host', :path => 'de')
-    site_e = Comfy::Cms::Site.create!(:identifier => 'test_e', :hostname => 'test3.host', :path => 'sp')
-
-    assert_equal site_d, Comfy::Cms::Site.find_site('test3.host', "#{base_path}/de")
-    assert_equal site_d, Comfy::Cms::Site.find_site('test3.host', "#{base_path}/de/some/path")
-    assert_nil           Comfy::Cms::Site.find_site('test99.host', "#{base_path}/de/some/path")
-
-    assert_nil            Comfy::Cms::Site.find_site('test3.host')
-    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp/some/path")
-    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp")
-    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp?a=b")
-    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp/some/path?a=b")
+  def test_find_site_with_public_cms_path
+    ComfortableMexicanSofa.config.public_cms_path = '/custom'
+    assert_equal '//test.host/custom', comfy_cms_sites(:default).url
+
+    site_a = Comfy::Cms::Site.create!(identifier: 'test_a', hostname: 'test2.host', path: 'en')
+    site_b = Comfy::Cms::Site.create!(identifier: 'test_b', hostname: 'test2.host', path: 'fr')
+
+    assert_nil            Comfy::Cms::Site.find_site('test2.host')
+    assert_nil            Comfy::Cms::Site.find_site('test2.host', '/custom/some/path')
+    assert_equal site_a,  Comfy::Cms::Site.find_site('test2.host', '/custom/en')
+    assert_equal site_a,  Comfy::Cms::Site.find_site('test2.host', '/custom/en?a=b')
+    assert_equal site_a,  Comfy::Cms::Site.find_site('test2.host', '/custom/en/some/path?a=b')
+
+    assert_nil            Comfy::Cms::Site.find_site('test2.host', '/custom/english/some/path')
+
+    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/custom/fr')
+    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/custom/fr?a=b')
+    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/custom/fr/some/path')
+    assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/custom/fr/some/path?a=b')
   end
 
   def test_find_site_with_site_alias
-    site_a = comfy_cms_sites(:default)
-    site_b = Comfy::Cms::Site.create!(:identifier => 'site_b', :hostname => 'test2.host')
+    site_a = @site
+    site_b = Comfy::Cms::Site.create!(identifier: "site_b", hostname: "test2.host")
 
     ComfortableMexicanSofa.config.hostname_aliases = {
-      'test.host'   => 'alias_a.host',
-      'test2.host'  => %w(alias_b.host alias_c.host)
+      "test.host"   => "alias_a.host",
+      "test2.host"  => %w(alias_b.host alias_c.host)
     }
 
-    assert_equal site_a, Comfy::Cms::Site.find_site('alias_a.host')
-    assert_equal site_b, Comfy::Cms::Site.find_site('alias_b.host')
-    assert_equal site_b, Comfy::Cms::Site.find_site('alias_c.host')
+    assert_equal site_a, Comfy::Cms::Site.find_site("alias_a.host")
+    assert_equal site_b, Comfy::Cms::Site.find_site("alias_b.host")
+    assert_equal site_b, Comfy::Cms::Site.find_site("alias_c.host")
   end
 
   def test_url
-    assert_equal '//test.host/', comfy_cms_sites(:default).url
-  end
+    assert_equal "//test.host", @site.url
+    assert_nil                  @site.url(relative: true)
 
-  def test_url_with_public_cms_path
-    ComfortableMexicanSofa.config.public_cms_path = '/custom'
-    assert_equal '//test.host/custom/', comfy_cms_sites(:default).url
-  end
+    @site.update_column(:path, "/site-path")
+    assert_equal "//test.host/site-path", @site.url
 
-end
+    ComfortableMexicanSofa.config.public_cms_path = "cms"
+    assert_equal "//test.host/cms/site-path", @site.url
+
+    assert_equal "/cms/site-path", @site.url(relative: true)
+  end
+end

data/test/models/snippet_test.rb

@@ -1,49 +1,55 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class CmsSnippetTest < ActiveSupport::TestCase
-  
+
+  setup do
+    @site = comfy_cms_sites(:default)
+  end
+
   def test_fixtures_validity
     Comfy::Cms::Snippet.all.each do |snippet|
       assert snippet.valid?, snippet.errors.full_messages.to_s
     end
   end
-  
+
   def test_validations
     snippet = Comfy::Cms::Snippet.new
     snippet.save
     assert snippet.invalid?
-    assert_has_errors_on snippet, :site_id, :label, :identifier
+    assert_has_errors_on snippet, :site, :label, :identifier
   end
-  
+
   def test_label_assignment
-    snippet = comfy_cms_sites(:default).snippets.new(
-      :identifier => 'test'
+    snippet = @site.snippets.new(
+      identifier: "test"
     )
     assert snippet.valid?
-    assert_equal 'Test', snippet.label
+    assert_equal "Test", snippet.label
   end
-  
+
   def test_create
-    assert_difference 'Comfy::Cms::Snippet.count' do
-      snippet = comfy_cms_sites(:default).snippets.create(
-        :label      => 'Test Snippet',
-        :identifier => 'test',
-        :content    => 'Test Content'
+    assert_difference "Comfy::Cms::Snippet.count" do
+      snippet = @site.snippets.create(
+        label:      "Test Snippet",
+        identifier: "test",
+        content:    "Test Content"
       )
-      assert_equal 'Test Snippet', snippet.label
-      assert_equal 'test', snippet.identifier
-      assert_equal 'Test Content', snippet.content
+      assert_equal "Test Snippet", snippet.label
+      assert_equal "test", snippet.identifier
+      assert_equal "Test Content", snippet.content
       assert_equal 1, snippet.position
     end
   end
-  
+
   def test_update_forces_page_content_reload
     snippet = comfy_cms_snippets(:default)
-    page = comfy_cms_pages(:default)
-    assert_match snippet.content, page.content_cache
-    snippet.update_attributes(:content => 'new_snippet_content')
+    page    = comfy_cms_pages(:default)
+    comfy_cms_fragments(:default).update_column(:content, "{{cms:snippet default}}")
+    page.clear_content_cache!
+
+    assert_equal "snippet content", page.content_cache
+    snippet.update_attributes(content: "new snippet content")
     page.reload
-    assert_match /new_snippet_content/, page.content_cache
+    assert_equal "new snippet content", page.content_cache
   end
-  
 end

data/test/models/translation_test.rb

@@ -0,0 +1,60 @@
+require_relative '../test_helper'
+
+class CmsPageTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_fixtures_validity
+    Comfy::Cms::Translation.all.each do |translation|
+      assert translation.valid?, translation.errors.full_messages.to_s
+    end
+  end
+
+  def test_validations
+    translation = Comfy::Cms::Translation.new
+    translation.save
+    assert translation.invalid?
+    assert_has_errors_on translation, :page, :layout, :locale, :label
+  end
+
+  def test_validation_on_locale_uniqueness
+    translation = @page.translations.new(
+      label: "Test",
+      locale: comfy_cms_translations(:default).locale
+    )
+    assert translation.invalid?
+    assert_has_errors_on translation, :locale
+  end
+
+  def test_validation_on_locale_uniqueness_against_site
+    translation = @page.translations.new(
+      label: "Test",
+      locale: comfy_cms_sites(:default).locale
+    )
+    assert translation.invalid?
+    assert_has_errors_on translation, :locale
+  end
+
+  def test_creation
+    assert_count_difference [Comfy::Cms::Translation, Comfy::Cms::Fragment] do
+      translation = @page.translations.create(
+        locale: "test",
+        label:  "Test Translation",
+        fragments_attributes: [
+          { identifier: "content",
+            tag:        "text",
+            content:    "test" }
+        ]
+      )
+      assert_equal @page.layout, translation.layout
+    end
+  end
+
+  def test_scope_published
+    assert_equal 1, Comfy::Cms::Translation.published.count
+    comfy_cms_translations(:default).update_columns(is_published: false)
+    assert_equal 0, Comfy::Cms::Translation.published.count
+  end
+end

data/test/tasks/cms_seeds_test.rb

@@ -0,0 +1,33 @@
+require_relative "../test_helper"
+require "rake"
+
+class CmsSeedsTaskTest < ActiveSupport::TestCase
+
+  setup do
+    @rake = Rake::Application.new
+    Rake.application = @rake
+    # We force rake file reload by passing empty array as the last parameter
+    Rake.application.rake_require("tasks/cms_seeds", $LOAD_PATH, [])
+    Rake::Task.define_task(:environment)
+  end
+
+  def test_import
+    importer = mock()
+    ComfortableMexicanSofa::Seeds::Importer.expects(:new).with("from_folder", "to_site").returns(importer)
+    importer.expects(:import!)
+
+    with_captured_stout do
+      @rake["comfy:cms_seeds:import"].invoke("from_folder", "to_site")
+    end
+  end
+
+  def test_export
+    exporter = mock()
+    ComfortableMexicanSofa::Seeds::Exporter.expects(:new).with("from_site", "to_folder").returns(exporter)
+    exporter.expects(:export!)
+
+    with_captured_stout do
+      @rake["comfy:cms_seeds:export"].invoke("from_site", "to_folder")
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 ENV['RAILS_ENV'] = 'test'
 
 require 'simplecov'
@@ -14,8 +13,8 @@ require 'rails/test_help'
 require 'rails/generators'
 require 'mocha/setup'
 
-# No need to add cache-busters in test environment
-Paperclip::Attachment.default_options[:use_timestamp] = false
+Rails.backtrace_cleaner.remove_silencers!
+
 
 class ActiveSupport::TestCase
 
@@ -24,8 +23,7 @@ class ActiveSupport::TestCase
   fixtures :all
 
   setup :reset_config,
-        :reset_locale,
-        :stub_paperclip
+        :reset_locale
 
   # resetting default configuration
   def reset_config
@@ -36,17 +34,16 @@ class ActiveSupport::TestCase
       config.public_auth          = 'ComfortableMexicanSofa::AccessControl::PublicAuthentication'
       config.public_authorization = 'ComfortableMexicanSofa::AccessControl::PublicAuthorization'
       config.admin_route_redirect = ''
-      config.enable_fixtures      = false
-      config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
+      config.enable_seeds         = false
+      config.seeds_path           = File.expand_path('db/cms_seeds', Rails.root)
       config.revisions_limit      = 25
       config.locales              = {
         'en' => 'English',
         'es' => 'Español'
       }
       config.admin_locale         = nil
-      config.upload_file_options  = { }
       config.admin_cache_sweeper  = nil
-      config.allow_irb            = false
+      config.allow_erb            = false
       config.allowed_helpers      = nil
       config.allowed_partials     = nil
       config.allowed_templates    = nil
@@ -93,31 +90,35 @@ class ActiveSupport::TestCase
   end
 
   def assert_no_select(selector, value = nil)
-    assert_select(selector, :text => value, :count => 0)
+    assert_select(selector, text: value, count: 0)
   end
 
-  # Small method that allows for better formatting in tests
-  def rendered_content_formatter(string)
-    string.gsub(/^[ ]+/, '')
+  def assert_count_difference(models, number = 1, &block)
+    counts = [models].flatten.map{|m| "#{m}.count"}
+    assert_difference counts, number do
+      yield
+    end
   end
 
-  def stub_paperclip
-    Comfy::Cms::Block.any_instance.stubs(:save_attached_files).returns(true)
-    Comfy::Cms::Block.any_instance.stubs(:delete_attached_files).returns(true)
-    Paperclip::Attachment.any_instance.stubs(:post_process).returns(true)
+  def assert_count_no_difference(*models, &block)
+    counts = [models].flatten.map{|m| "#{m}.count"}
+    assert_no_difference counts do
+      yield
+    end
   end
 
-end
-
-class ActionController::TestCase
-
-  setup :setup_auth
-
-  def setup_auth
-    @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64('username:password')}"
+  # Capturing STDOUT into a string
+  def with_captured_stout
+    old = $stdout
+    $stdout = StringIO.new
+    yield
+    $stdout.string
+  ensure
+    $stdout = old
   end
 end
 
+
 class ActionDispatch::IntegrationTest
 
   setup :setup_host
@@ -127,16 +128,21 @@ class ActionDispatch::IntegrationTest
   end
 
   # Attaching http_auth stuff with request. Example use:
-  #   http_auth :get, '/cms-admin/pages'
-  def http_auth(method, path, options = {}, username = 'username', password = 'password')
-    send(method, path, options, {'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64(username + ':' + password)}"})
+  #   r :get, '/cms-admin/pages'
+  def r(method, path, options = {})
+    headers = options[:headers] || {}
+    headers['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(
+      ComfortableMexicanSofa::AccessControl::AdminAuthentication.username,
+      ComfortableMexicanSofa::AccessControl::AdminAuthentication.password
+    )
+    options.merge!(headers: headers)
+    send(method, path, options)
   end
 
-  # Overriding helper method as it doesn't really work for integration tests by default
   def with_routing(&block)
     yield ComfortableMexicanSofa::Application.routes
   ensure
-    load File.expand_path('../config/cms_routes.rb', File.dirname(__FILE__))
+    ComfortableMexicanSofa::Application.routes_reloader.reload!
   end
 end
 
@@ -150,10 +156,22 @@ class Rails::Generators::TestCase
   def prepare_files
     config_path = File.join(self.destination_root, 'config')
     routes_path = File.join(config_path, 'routes.rb')
+    app_path    = File.join(config_path, 'application.rb')
     FileUtils.mkdir_p(config_path)
     FileUtils.touch(routes_path)
     File.open(routes_path, 'w') do |f|
-      f.write("Test::Application.routes.draw do\n\nend")
+      f.write <<-RUBY.strip_heredoc
+        Test::Application.routes.draw do
+        end
+      RUBY
+    end
+    File.open(app_path, 'w') do |f|
+      f.write <<-RUBY.strip_heredoc
+        module TestApp
+          class Application < Rails::Application
+          end
+        end
+      RUBY
     end
   end
 
@@ -165,5 +183,4 @@ class Rails::Generators::TestCase
       )
     )
   end
-
 end