Fixed more unit-tests

ngiger · May 13, 2015 · c1f3980 · c1f3980
1 parent 23a38e1
commit c1f3980
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/test/test_custom/test_lookandfeelwrapper.rb b/test/test_custom/test_lookandfeelwrapper.rb
@@ -66,7 +66,7 @@ def create_env
     def test_google_analytics_token_evidentia
       create_env
       @lookandfeel = LookandfeelEvidentia.new(@component)
-      assert_equal('UA-22215261-1', @lookandfeel.google_analytics_token)
+      assert_equal('UA-22215261-3', @lookandfeel.google_analytics_token)
     end
     def test_google_analytics_token_desitin
       create_env
@@ -219,7 +219,6 @@ def test_explain_result_components
         [0, 4]=>:explain_complementary,
         [0, 5]=>"explain_unknown",
         [0, 6]=>"explain_expired",
-        [0, 7]=>:explain_cas,
         [1, 0]=>:explain_limitation,
         [1, 1]=>:explain_fachinfo,
         [1, 2]=>:explain_narc,

diff --git a/test/test_model/search_result.rb b/test/test_model/search_result.rb
@@ -42,15 +42,21 @@ def test_packages
                           :name_base       => 'package1',
                           :galenic_forms   => [],
                           :dose            => 'dose',
-                          :comparable_size => 1
+                          :company         => 'company',
+                          :out_of_trade    => false,
+                          :sl_generic_type => :original,
+                          :comparable_size => 1,
                          )
       package2 = flexmock('package2', 
                           :expired?        => nil,
                           :generic_type    => :original,
                           :name_base       => 'package2',
                           :galenic_forms   => [],
                           :dose            => 'dose',
-                          :comparable_size => 1
+                          :company         => 'company',
+                          :out_of_trade    => false,
+                          :sl_generic_type => :original,
+                          :comparable_size => 1,
                          )
 
       active_packages = [package2, package1]
@@ -163,7 +169,11 @@ def test_atc_sorted__search_type_substance
                            :galenic_forms   => [],
                            :dose            => 'dose',
                            :comparable_size => 1,
-                           :active_agents   => [active_agent]
+                           :active_agents   => [active_agent],
+                          :company         => 'company',
+                          :out_of_trade    => false,
+                          :comparable_size => 1,
+                          :sl_generic_type => :original,
                           )
       atc_class = flexmock('atc_class', 
                            :package_count => 1,

diff --git a/test/test_state/drugs/recentregs.rb b/test/test_state/drugs/recentregs.rb
@@ -30,10 +30,12 @@ def setup
                        :generic_type    => 'generic_type',
                        :galenic_forms   => [galenic_form],
                        :comparable_size => 'comparable_size',
-                       :company => 'company',
                        :expired?  => nil,
                        :name_base => 'name_base',
-                       :dose      => 'dose'
+                       :dose      => 'dose',
+                       :company => 'company',
+                       :out_of_trade => false,
+                       :sl_generic_type => :original,
                       )
     registration = flexmock('registration') do |reg|
       reg.should_receive(:each_package).and_yield(package)
@@ -69,7 +71,10 @@ def setup
                        :comparable_size => 'comparable_size',
                        :expired?  => nil,
                        :name_base => 'name_base',
-                       :dose      => 'dose'
+                       :dose      => 'dose',
+                       :company => 'company',
+                       :out_of_trade => false,
+                       :sl_generic_type => :original,
                       )
 
     @registration = flexmock('registration') do |reg|

diff --git a/test/test_state/suggest_address.rb b/test/test_state/suggest_address.rb
@@ -33,6 +33,7 @@ def setup
                        )
     doctor   = flexmock('doctor', :fullname => 'fullname')
     hospital   = flexmock('hospital', :oid => 'oid', :fullname => 'fullname')
+    @address = flexmock('address', :oid => 'oid', :fullname => 'fullname')
     @session = flexmock('session',
                         :app => @app,
                         :lookandfeel => @lnf,
@@ -41,7 +42,7 @@ def setup
                         :request_path => 'request_path',
                         :search_hospital => hospital,
                         :set_cookie_input => 'set_cookie_input',
-#                        :search_doctor => doctor
+                        :get_address_parent => @address,
                        ).by_default
     parent   = flexmock('parent', :fullname => 'fullname')
     @model   = flexmock('model',