Commit 5b3ded014807fe900be505bd602028c5da0fbdea

Authored by Fabio Teixeira
Committed by David Silva
1 parent 587d9307

Fix broken unit tests

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
test/unit/database_helper_test.rb
@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class DatabaseHelperTest < ActiveSupport::TestCase 3 class DatabaseHelperTest < ActiveSupport::TestCase
4 4
5 - include DatabaseHelper  
6 -  
7 def setup 5 def setup
8 dd1 = DatabaseDescription.create(:name => "Oracle") 6 dd1 = DatabaseDescription.create(:name => "Oracle")
9 dd2 = DatabaseDescription.create!(:name => "MySQL") 7 dd2 = DatabaseDescription.create!(:name => "MySQL")
test/unit/library_helper_test.rb
@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class LibraryHelperTest < ActiveSupport::TestCase 3 class LibraryHelperTest < ActiveSupport::TestCase
4 4
5 - include LibraryHelper  
6 -  
7 def setup 5 def setup
8 @license_objects = [ 6 @license_objects = [
9 {"name" => "license1" ,"version" => "2.0", "license" => "debian", "software_id" => "1"}, 7 {"name" => "license1" ,"version" => "2.0", "license" => "debian", "software_id" => "1"},
@@ -48,7 +46,7 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase @@ -48,7 +46,7 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase
48 library_description.name = "Lib" 46 library_description.name = "Lib"
49 47
50 libraries << library_description 48 libraries << library_description
51 - lib_table = LibraryHelper.library_as_tables(libraries) 49 + lib_table = LibraryHelper.libraries_as_tables(libraries)
52 50
53 assert_not_nil lib_table.first.call.index("lib") 51 assert_not_nil lib_table.first.call.index("lib")
54 end 52 end
test/unit/operating_system_helper_test.rb
@@ -6,8 +6,6 @@ OperatingSystemName.create(:name=&gt;&quot;CentOS&quot;) @@ -6,8 +6,6 @@ OperatingSystemName.create(:name=&gt;&quot;CentOS&quot;)
6 6
7 class OperatingSystemHelperTest < ActiveSupport::TestCase 7 class OperatingSystemHelperTest < ActiveSupport::TestCase
8 8
9 - include OperatingSystemHelper  
10 -  
11 def setup 9 def setup
12 @operating_system_objects = [ 10 @operating_system_objects = [
13 {:operating_system_name_id => "1" ,:version => "2.0"}, 11 {:operating_system_name_id => "1" ,:version => "2.0"},
test/unit/software_language_helper_test.rb
@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class SoftwareLanguageHelperTest < ActiveSupport::TestCase 3 class SoftwareLanguageHelperTest < ActiveSupport::TestCase
4 4
5 - include SoftwareLanguageHelper  
6 -  
7 def setup 5 def setup
8 pl1 = ProgrammingLanguage.create(:name => "Python") 6 pl1 = ProgrammingLanguage.create(:name => "Python")
9 pl2 = ProgrammingLanguage.create(:name => "Java") 7 pl2 = ProgrammingLanguage.create(:name => "Java")