Download as
Browse Code »

Commit 0e26cea3498b45e39eac108bf838a72b66096f7d

Authored by Rodrigo Souto
1 parent 0c1d441e
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixing noosfero tests

Showing 3 changed files with 2 additions and 12 deletions   Show diff stats
app/views/layouts/application-ng.rhtml
  Diff comments   View file @0e26cea
... ... @@ -69,7 +69,7 @@
69 69 <% end %>
70 70  
71 71 </span>
72   - <form action="/search" class="search_form" method="get" class="clean">
  72 + <form id="top-search" action="/search" class="search_form clean" method="get">
73 73 <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
74 74 <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
75 75 <%= javascript_tag 'jQuery("#user form input").hint();' %>
... ...
app/views/map_balloon/product.rhtml
  Diff comments   View file @0e26cea
1 1 <div id="balloon">
2   - <%= render :partial => 'search/product', :locals => {:product => @product} %>
  2 + <%= render :partial => 'search/full_product', :locals => {:product => @product} %>
3 3 </div>
... ...
test/functional/home_controller_test.rb
  Diff comments   View file @0e26cea
... ... @@ -136,14 +136,4 @@ class HomeControllerTest &lt; ActionController::TestCase
136 136 assert_no_tag :tag => 'a', :attributes => {:href => '/account/signup'}
137 137 end
138 138  
139   - should "not display search field if there is no search engine on" do
140   - Noosfero::Plugin::Manager.any_instance.stubs(:first).with(:search_engine?).returns(false)
141   - get :index
142   - assert_no_tag :tag => 'input', :attributes => {:name => 'query'}
143   -
144   - Noosfero::Plugin::Manager.any_instance.stubs(:first).with(:search_engine?).returns(true)
145   - get :index
146   - assert_tag :tag => 'input', :attributes => {:name => 'query'}
147   - end
148   -
149 139 end
... ...