Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging

Evandro Jr
2 parents 416e5e6e fe6dd433
Showing 19 changed files with 126 additions and 153 deletions Show diff stats
Gemfile
Gemfile.lock
app/helpers/application_helper.rb
app/models/product_category.rb
app/models/user.rb
app/views/blocks/profile_info.html.erb
lib/noosfero/api/helpers.rb
lib/tasks/plugins_tests.rake
plugins/custom_forms/po/es/custom_forms.po
plugins/organization_ratings/po/pt/organization_ratings.po
plugins/remote_user/lib/remote_user_plugin.rb
plugins/remote_user/test/functional/remote_user_plugin_test.rb
plugins/require_auth_to_comment/po/es/require_auth_to_comment.po
plugins/shopping_cart/po/es/shopping_cart.po
po/es/noosfero-doc.po
po/es/noosfero.po
test/functional/content_viewer_controller_test.rb
test/unit/product_category_test.rb
test/unit/user_test.rb
@@ -34,7 +34,7 @@ gem &#39;slim&#39;
 # API dependencies
 gem 'grape',                    '~> 0.12'
-gem 'grape-entity'
+gem 'grape-entity',             '= 0.4.8'
 gem 'grape_logging'
 gem 'grape-swagger'
 gem 'swagger-ui_rails'
@@ -48,7 +48,7 @@ gem &#39;api-pagination&#39;,           &#39;~&gt; 4.1.1&#39;
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
 gem 'sass-rails'
-gem 'sprockets-rails', '~> 2.3'
+gem 'sprockets-rails', '~> 2.1'
 # gems to enable rails3 behaviour
 gem 'protected_attributes'
@@ -230,7 +230,7 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.5.0)
+    grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
     grape-swagger (0.10.2)
@@ -439,7 +439,7 @@ DEPENDENCIES
   gdata (> 0.0.0)!
   gettext (~> 3.1)
   grape (~> 0.12)
-  grape-entity
+  grape-entity (~> 0.4.8)
   grape-swagger
   grape_logging
   honeypot (= 0.0.0)!
@@ -477,7 +477,7 @@ DEPENDENCIES
   selenium-webdriver
   slim
   spring
-  sprockets-rails (~> 2.3)
+  sprockets-rails (~> 2.1)
   swagger-ui_rails
   test-unit
   uglifier (>= 1.0.3)
@@ -505,32 +505,6 @@ module ApplicationHelper
     sex
   end
-  def profile_cat_icons( profile )
-    if profile.class == Enterprise
-      icons = profile.product_categories.unique_by_level(2).limit(3).map do |c|
-        filtered_category = c.filtered_category.blank? ? c.path.split('/').last : c.filtered_category
-        category_title = filtered_category.split(/[-_\s,.;'"]+/).map(&:capitalize).join(' ')
-        category_name = category_title.gsub(' ', '_' )
-        category_icon = "/images/icons-cat/#{category_name}.png"
-        if ! File.exists?(Rails.root.join('public', category_icon))
-          category_icon = '/images/icons-cat/undefined.png'
-        end
-        content_tag('span',
-          content_tag( 'span', category_title ),
-          :title => category_title,
-          :class => 'product-cat-icon cat_icon_' + category_name,
-          :style => "background-image:url(#{category_icon})"
-        )
-      end.join("\n").html_safe
-      content_tag('div',
-        content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
-        :class => 'product-category-icons'
-      )
-    else
-      ''
-    end
-  end
-
   def links_for_balloon(profile)
     if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
       if profile.kind_of?(Person)
@@ -589,7 +563,7 @@ module ApplicationHelper
     link_to(
       content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      extra_info + profile_sex_icon( profile ),
       profile.url,
       :class => 'profile_link url',
       :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
@@ -13,9 +13,6 @@ class ProductCategory &lt; Category
   scope :by_environment, -> environment {
     where 'environment_id = ?', environment.id
   }
-  scope :unique_by_level, -> level {
-    select "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
-  }
   def all_products
     Product.where(product_category_id: (all_children << self).map(&:id))
@@ -172,11 +172,6 @@ class User &lt; ActiveRecord::Base
     end
   end
-  TOKEN_VALIDITY = 2.weeks
-  def private_token_expired?
-    self.private_token.nil? || (self.private_token_generated_at + TOKEN_VALIDITY < DateTime.now)
-  end
-
   # Activates the user in the database.
   def activate
     return false unless self.person
@@ -7,8 +7,7 @@
     <span class="profile-info-picture-inner2">
       <%=
         profile_image(block.owner, :thumb) +"\n"+
-        profile_sex_icon( profile ) +
-        profile_cat_icons( profile )
+        profile_sex_icon( profile )
       %>
     </span>
   </div>
@@ -34,7 +34,6 @@ require_relative &#39;../../find_by_contents&#39;
       def current_user
         private_token = (params[PRIVATE_TOKEN_PARAM] || headers['Private-Token']).to_s
         @current_user ||= User.find_by_private_token(private_token)
-        @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
         @current_user
       end
@@ -111,7 +111,8 @@ def run_test(name, files)
 end
 def run_minitest files
-  sh 'ruby', '-Itest', *files
+  files = files.map{|f| File.join(Rails.root, f)}
+  sh 'ruby', '-Itest', '-e ARGV.each{|f| require f}', *files
 end
 def run_cucumber(profile, files)
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-03-09 09:51+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2016-01-04 15:22+0000\n"
+"Last-Translator: María Vecino <mariavecino@ecoalternative.net>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
 "custom-forms/es/>\n"
 "Language: es\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.5-dev\n"
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 #, fuzzy
@@ -66,9 +66,8 @@ msgstr &quot;%{fn} es obligatorio&quot;
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:14
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:47
-#, fuzzy
 msgid "Logged users"
-msgstr "Autenticado como %s"
+msgstr "Usuarios registrados"
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:19
 #, fuzzy
@@ -193,7 +192,7 @@ msgstr &quot;Nombre&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:20
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:41
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:31
 msgid "Your e-mail will be visible to this form's owners."
@@ -99,9 +99,9 @@ msgid &quot;&quot;
 "      about your request."
 msgstr ""
 "Seu pedido para comentar em %{target} foi\n"
-"      enviado. O administrador irá recebê-lo e aprovarou\n"
+"      enviado. O administrador irá recebê-lo e aprovar ou\n"
 " rejeitar seu pedido de acordo com seus métodos e critérios.\n"
-"      Você será notificado assim que o administrador tenha umaposição\n"
+"      Você será notificado assim que o administrador tenha uma posição\n"
 "      sobre seu pedido."
 #: plugins/organization_ratings/lib/create_organization_rating_comment.rb:112
@@ -220,7 +220,7 @@ msgstr &quot;Veja mais&quot;
 #: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:4
 msgid "Rating: "
-msgstr "Avaliação:"
+msgstr "Avaliação: "
 #: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:18
 msgid "Be the first to rate!"
@@ -28,9 +28,9 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
           end
           if !logged_in?
-            self.current_user = User.find_by_login(remote_user)
+            self.current_user = User.where(environment_id: environment, login: remote_user).first
             unless self.current_user
-              self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
+              self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
               self.current_user.activate
             end
             self.current_user.save!
@@ -39,9 +39,9 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
               self.current_user.forget_me
               reset_session
-              self.current_user = User.find_by_login(remote_user)
+	      self.current_user = User.where(environment_id: environment, login: remote_user).first
               unless self.current_user
-                self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
+                self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
                 self.current_user.activate
               end
               self.current_user.save!
@@ -6,6 +6,10 @@ class AccountControllerTest &lt; ActionController::TestCase
     @environment.enabled_plugins = ['RemoteUserPlugin']
     @environment.save
+    @another_environment = Environment.new(name: "AnotherEnvironment")
+    @another_environment.enabled_plugins = ['RemoteUserPlugin']
+    @another_environment.save
+
     @controller = AccountController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -136,4 +140,26 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert session[:user].blank?
     assert_response 404
   end
+
+  should "create an user in the correct environment" do
+    @controller.stubs(:environment).returns(@another_environment)
+    @request.env["HTTP_REMOTE_USER"] = "testuser"
+
+    get :index
+    user = User.last
+    assert_equal user.environment, @another_environment
+  end
+
+  should "create an user in both environments" do
+    user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
+    @controller.stubs(:environment).returns(@another_environment)
+    @request.env["HTTP_REMOTE_USER"] = "testuser"
+
+    users = User.where(:login => 'testuser')
+    assert_equal users.count, 1
+
+    get :index
+    users = User.where(:login => 'testuser')
+    assert_equal users.count, 2
+  end
 end
@@ -7,16 +7,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2014-11-03 15:52+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/es/>\n"
+"PO-Revision-Date: 2016-01-04 15:23+0000\n"
+"Last-Translator: María Vecino <mariavecino@ecoalternative.net>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
+"require-auth-to-comment/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0-dev\n"
+"X-Generator: Weblate 2.5-dev\n"
 #: plugins/require_auth_to_comment/lib/require_auth_to_comment_plugin.rb:12
 msgid "Requires users to authenticate in order to post comments."
@@ -37,7 +37,7 @@ msgstr &quot;&quot;
 #: plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb:17
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 #: plugins/require_auth_to_comment/views/profile-editor-extras.html.erb:1
 msgid "Comments"
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:34-0300\n"
-"PO-Revision-Date: 2015-02-23 11:35+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2016-01-04 15:24+0000\n"
+"Last-Translator: María Vecino <mariavecino@ecoalternative.net>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
 "shopping-cart/es/>\n"
 "Language: es\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.5-dev\n"
 #: plugins/shopping_cart/lib/shopping_cart_plugin.rb:10
 msgid "A shopping basket feature for enterprises"
@@ -275,13 +275,12 @@ msgid &quot;Name&quot;
 msgstr "Nombre"
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16
-#, fuzzy
 msgid "Email"
 msgstr "Correo electrónico"
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17
 msgid "Contact phone"
-msgstr ""
+msgstr "Teléfono de contacto"
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:32
 #, fuzzy
@@ -7,9 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2013-12-10 15:48-0300\n"
-"PO-Revision-Date: 2015-02-07 03:08+0200\n"
-"Last-Translator: FAMMA TV NOTICIAS MEDIOS DE CO "
-"<revistafammatvmusic.oficial@gmail.com>\n"
+"PO-Revision-Date: 2016-01-04 15:52+0000\n"
+"Last-Translator: María Vecino <mariavecino@ecoalternative.net>\n"
 "Language-Team: Spanish "
 "<https://hosted.weblate.org/projects/noosfero/documentation/es/>\n"
 "Language: es\n"
@@ -17,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.2-dev\n"
+"X-Generator: Weblate 2.5-dev\n"
 # type: Content of: <h1>
 #. type: Content of: <h1>
@@ -2561,7 +2560,7 @@ msgstr &quot;&quot;
 #: doc/noosfero/community/editing-sideboxes.en.xhtml:1
 #: doc/noosfero/user/editing-sideboxes.en.xhtml:1
 msgid "Editing sideboxes"
-msgstr "Editando las bandejas laterales"
+msgstr "Editando cajas laterales"
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -2635,7 +2634,7 @@ msgstr &quot;Vers los bloques que puedes aadir a tu pgina:&quot;
 #: doc/noosfero/community/editing-sideboxes.en.xhtml:19
 #: doc/noosfero/user/editing-sideboxes.en.xhtml:17
 msgid "Add a block"
-msgstr "Aadir un bloque"
+msgstr "Añadir un bloque"
 # type: Content of: <ol><li><ol><li>
 #. type: Content of: <ol><li><ol><li>
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-8-g01ea9f7\n"
 "POT-Creation-Date: 2015-11-04 12:36-0300\n"
-"PO-Revision-Date: 2015-11-29 18:45+0000\n"
+"PO-Revision-Date: 2016-01-04 15:55+0000\n"
 "Last-Translator: María Vecino <mariavecino@ecoalternative.net>\n"
 "Language-Team: Spanish "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/es/>\n"
@@ -41,7 +41,7 @@ msgstr &quot;El artículo fue eliminado.&quot;
 #: app/models/approve_comment.rb:81
 msgid "%{requestor} wants to comment the article: %{article}."
-msgstr "% {requestor} quiere comentar el artículo:% {articule}"
+msgstr "%{requestor} quiere comentar el artículo: %{articule}"
 #: app/models/approve_comment.rb:83
 msgid "%{requestor} wanted to comment the article but it was removed."
@@ -130,7 +130,7 @@ msgstr &quot;Contenido&quot;
 #: app/models/comment.rb:34
 #, fuzzy
 msgid "{fn} can only be informed for unauthenticated authors"
-msgstr "%{fn} solamente puede ser informado por autores no autenticados"
+msgstr "%{fn} solamente puede ser informado por autores no autentificados"
 #: app/models/comment.rb:82
 msgid "(removed user)"
@@ -330,7 +330,7 @@ msgstr &quot;Abreviatura&quot;
 #: app/models/category.rb:9 app/models/article.rb:20
 msgid "Slug"
-msgstr ""
+msgstr "Ficha"
 #: app/models/category.rb:12
 msgid "{fn} cannot be like that."
@@ -551,7 +551,7 @@ msgstr &quot;Chat basado en XMPP/Jabber&quot;
 #: app/models/environment.rb:154
 msgid "Show a zoom link on all article images"
-msgstr "Muestra un enlace de acercamiento en todas las imágenes del artículo."
+msgstr "Muestra un enlace de acercamiento en todas las imágenes en artículos."
 #: app/models/environment.rb:155
 msgid "Ask captcha when a logged user comments too"
@@ -594,37 +594,39 @@ msgid &quot;Stays on the same page the user was before login.&quot;
 msgstr "Permanecer en la misma página en la que el usuario se identificó."
 #: app/models/environment.rb:170 app/models/environment.rb:182
+#, fuzzy
 msgid "Redirects the user to the environment homepage."
-msgstr ""
+msgstr "Redirige al usuario a la home"
 #: app/models/environment.rb:171 app/models/environment.rb:183
 msgid "Redirects the user to his profile page."
-msgstr ""
+msgstr "Redirige al usuario a su página de perfil."
 #: app/models/environment.rb:172 app/models/environment.rb:184
 msgid "Redirects the user to his homepage."
-msgstr ""
+msgstr "Redirige al usuario a la home."
 #: app/models/environment.rb:173 app/models/environment.rb:185
 msgid "Redirects the user to his control panel."
-msgstr ""
+msgstr "Redirige al usuario a su panel de control."
 #: app/models/environment.rb:174
 msgid "Specify the URL to redirect to:"
-msgstr ""
+msgstr "Especifique la URL para redirigir a:"
 #: app/models/environment.rb:181
 msgid "Stays on the same page the user was before signup."
 msgstr ""
+"Mantenerse en la misma página que el usuario estaba antes de registrarse."
 #: app/models/environment.rb:186
+#, fuzzy
 msgid "Redirects the user to the environment welcome page."
-msgstr ""
+msgstr "Redirige al usuario a la página de bienvenida."
 #: app/models/environment.rb:291
-#, fuzzy
 msgid "This enterprise needs to be enabled."
-msgstr "Tu empresa ha sido bloqueada"
+msgstr "Esta empresa tiene que estar habilitada."
 #: app/models/environment.rb:672
 msgid "Only one Virtual Community can be the default one"
@@ -636,8 +638,9 @@ msgid &quot;is not available.&quot;
 msgstr "No disponible"
 #: app/models/environment.rb:1018
+#, fuzzy
 msgid "have unsupported languages."
-msgstr ""
+msgstr "no permite ciertos idiomas."
 #: app/models/communities_block.rb:6 app/helpers/application_helper.rb:564
 #: app/helpers/application_helper.rb:1128 app/helpers/assets_helper.rb:11
@@ -677,12 +680,11 @@ msgstr &quot;Evento&quot;
 #: app/models/event.rb:33
 #, fuzzy
 msgid "{fn} cannot come before end date."
-msgstr "%{fn} no puede venir antes de la fecha."
+msgstr "%{fn} no puede aparecer antes de la fecha."
 #: app/models/event.rb:63
-#, fuzzy
 msgid "A calendar event."
-msgstr "Un evento de calendario"
+msgstr "Un evento de calendario."
 #: app/models/forum.rb:25 app/models/forum.rb:29
 #: app/models/link_list_block.rb:31 app/helpers/application_helper.rb:939
@@ -697,14 +699,13 @@ msgstr &quot;&quot;
 "las discusiones."
 #: app/models/forum.rb:38
-#, fuzzy
 msgid "Logged users"
-msgstr "Autenticado como %s"
+msgstr "Usuarios registrados"
 #: app/models/forum.rb:41
 #, fuzzy
 msgid "Me"
-msgstr "Masculino"
+msgstr "Mí"
 #: app/models/forum.rb:42 app/models/block.rb:250
 #: app/helpers/application_helper.rb:563
@@ -712,9 +713,8 @@ msgid &quot;Friends&quot;
 msgstr "Amigos"
 #: app/models/forum.rb:45
-#, fuzzy
 msgid "Administrators"
-msgstr "Administación"
+msgstr "Administadores"
 #: app/models/forum.rb:46 app/models/block.rb:250
 #: app/helpers/profile_helper.rb:43 app/helpers/application_helper.rb:571
@@ -794,23 +794,20 @@ msgstr &quot;&quot;
 "si este perfil debe ser dishabilitado o no."
 #: app/models/image.rb:20
-#, fuzzy
 msgid "{fn} of uploaded file was larger than the maximum size of 5.0 MB"
 msgstr "%{fn} del archivo subido fue más grande que el tamaño máximo de 5.0 MB"
 #: app/models/profile_suggestion.rb:35 app/models/profile_suggestion.rb:38
-#, fuzzy
 msgid "Friends in common"
-msgstr "Invitación de amigo"
+msgstr "Amigos en común"
 #: app/models/profile_suggestion.rb:36
-#, fuzzy
 msgid "Communities in common"
-msgstr "Menú comunidades"
+msgstr "Comunidades en común"
 #: app/models/profile_suggestion.rb:37 app/models/profile_suggestion.rb:39
 msgid "Tags in common"
-msgstr ""
+msgstr "Palabras claves en común"
 #: app/models/person.rb:13 app/models/link_list_block.rb:29
 #: app/views/templates/index.html.erb:5
@@ -923,19 +920,17 @@ msgstr &quot;Código postal&quot;
 #: app/models/person.rb:261 app/models/organization.rb:138
 #: app/views/profile_editor/_person_form.html.erb:27
 #: app/views/shared/_organization_custom_fields.html.erb:14
-#, fuzzy
 msgid "District"
-msgstr "Restricciones"
+msgstr "Distrito"
 #: app/models/person.rb:261 app/models/organization.rb:138
 #: app/views/profile_editor/_person_form.html.erb:26
 #: app/views/shared/_organization_custom_fields.html.erb:13
 #, fuzzy
 msgid "Address reference"
-msgstr "Dirección: "
+msgstr "Dirección:"
 #: app/models/person.rb:292
-#, fuzzy
 msgid "{fn} is already used by other user"
 msgstr "%{fn} ya lo tiene otro usuario"
@@ -1001,16 +996,14 @@ msgid &quot;%{requestor} wants to activate enterprise %{linked_subject}.&quot;
 msgstr "%{requestor} quiere activar la empresa %{linked_subject}."
 #: app/models/enterprise_activation.rb:29
-#, fuzzy
 msgid "Pending activation of enterprise %{linked_subject}."
-msgstr "%{requestor} quiere activar la empresa %{linked_subject}."
+msgstr "%{requestor} Pendiente de activar la empresa %{linked_subject}."
 #: app/models/enterprise_activation.rb:43
 msgid "%{requestor} wants to activate enterprise %{enterprise}."
 msgstr "%{rquestor} quiere activar la empresa %{enterprise}."
 #: app/models/enterprise_activation.rb:45
-#, fuzzy
 msgid "Pending activation of enterprise %{enterprise}."
 msgstr "%{rquestor} quiere activar la empresa %{enterprise}."
@@ -1025,7 +1018,7 @@ msgstr &quot;Invitación&quot;
 #: app/models/invitation.rb:41
 msgid "You can't invite youself"
-msgstr "No puedes invitarte a ti."
+msgstr "No puedes invitarte a ti mismo."
 #: app/models/invitation.rb:53
 msgid "Firstname Lastname <friend@email.com>"
@@ -1040,9 +1033,8 @@ msgid &quot;Raw HTML&quot;
 msgstr "HTML plano"
 #: app/models/person_notifier.rb:103
-#, fuzzy
 msgid "[%s] Notifications"
-msgstr "Opciones de moderación"
+msgstr "Notificaciones"
 #: app/models/moderate_user_registration.rb:31
 #: app/views/account/login.html.erb:36
@@ -1051,13 +1043,12 @@ msgid &quot;New user&quot;
 msgstr "Nuevo usuario"
 #: app/models/moderate_user_registration.rb:39
-#, fuzzy
 msgid "%{sender} wants to register."
-msgstr "%{requestor} quiere ser tu amigo."
+msgstr "%{requestor} quiere registrarse."
 #: app/models/moderate_user_registration.rb:48
 msgid "%{sender} tried to register."
-msgstr ""
+msgstr "%{sender} intentó registrarse."
 #: app/models/moderate_user_registration.rb:54
 #, fuzzy
@@ -1879,7 +1870,7 @@ msgstr &quot;Artículo de texto con editor visual&quot;
 #: app/models/tiny_mce_article.rb:10
 msgid "Not accessible for visually impaired users."
-msgstr "No accesible para usuarios con deficiencias visuales"
+msgstr "No accesible para usuarios con déficit visual."
 #: app/models/suggest_article.rb:52
 msgid "Article suggestion"
@@ -2424,7 +2415,7 @@ msgstr &quot;Mensaje de \&quot;deshabilitar empresa\&quot;&quot;
 #: app/models/disabled_enterprise_message_block.rb:8
 msgid "Shows a message for disabled enterprises."
-msgstr "Muestra un mensaje para empresas deshabilitadas"
+msgstr "Muestra un mensaje para empresas deshabilitadas."
 #: app/models/disabled_enterprise_message_block.rb:12
 #: app/mailers/contact.rb:23
@@ -2624,7 +2615,7 @@ msgstr &quot;Buscar...&quot;
 #: app/helpers/application_helper.rb:669
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
-"Esta es una caja de búsqueda. Seleccione aquí, escribe tu consulta y "
+"Esta es una caja de búsqueda. Seleccione aquí, escribe la consulta y "
 "presione enter para buscar."
 #: app/helpers/application_helper.rb:670
@@ -2822,7 +2813,7 @@ msgstr &quot;Reportar abuso&quot;
 #: app/helpers/application_helper.rb:1266
 msgid "You already reported this profile."
-msgstr "Tú ya has reportado este perfil"
+msgstr "Ya has reportado este perfil."
 #: app/helpers/application_helper.rb:1267
 msgid "Report this profile for abusive behaviour"
@@ -3121,7 +3112,7 @@ msgstr &quot;Teléfono (s):&quot;
 #: app/helpers/enterprise_homepage_helper.rb:9
 msgid "Location:"
-msgstr "Ubicación"
+msgstr "Ubicación:"
 #: app/helpers/enterprise_homepage_helper.rb:10
 #: app/views/cms/_event.html.erb:16
@@ -3746,7 +3737,7 @@ msgstr &quot;Última publicación&quot;
 # Usamos etiquetas o entendemos qeu tag es de uso común?
 #: app/helpers/tags_helper.rb:34
 msgid "No tags yet."
-msgstr "Sin etiquetas"
+msgstr "Sin etiquetas todavía."
 #: app/helpers/tags_helper.rb:35
 msgid "What are tags?"
@@ -3852,7 +3843,7 @@ msgstr &quot;Biofísica&quot;
 #: app/helpers/profile_editor_helper.rb:15
 msgid "Biology"
-msgstr "Biología "
+msgstr "Biología"
 #: app/helpers/profile_editor_helper.rb:16
 msgid "Biotechnology"
@@ -4160,7 +4151,7 @@ msgstr &quot;[Seleccione ...]&quot;
 #: app/helpers/profile_editor_helper.rb:132
 msgid "Preferred domain name:"
-msgstr "Nombre de dominio preferido"
+msgstr "Nombre de dominio elegido:"
 #: app/helpers/profile_editor_helper.rb:132
 msgid "Select domain"
@@ -4220,12 +4211,12 @@ msgstr &quot;Características actualizadas correctamente.&quot;
 #: app/controllers/admin/features_controller.rb:27
 msgid "Person fields updated successfully."
-msgstr "Campo persona actualizado correctamente"
+msgstr "Campos de persona actualizados correctamente"
 # No se si campo es la mejor traducción de fields
 #: app/controllers/admin/features_controller.rb:29
 msgid "Person fields not updated successfully."
-msgstr "El campo persona no se actualizo correctamente"
+msgstr "Los campos de la persona no se actualizaron correctamente."
 #: app/controllers/admin/features_controller.rb:37
 msgid "Enterprise fields updated successfully."
@@ -4370,7 +4361,7 @@ msgstr &quot;Características actualizadas correctamente.&quot;
 # No se si campo es la mejor traducción de fields
 #: app/controllers/admin/plugins_controller.rb:14
 msgid "Plugins were not updated successfully."
-msgstr "Las caracteristicas no se actualizaron correctamente"
+msgstr "Los pluggings no se actualizaron correctamente"
 #: app/controllers/admin/licenses_controller.rb:14
 #, fuzzy
@@ -4647,7 +4638,7 @@ msgstr &quot;Ya eres amigo de %s.&quot;
 #: app/controllers/public/profile_controller.rb:160
 msgid "You have unblocked %s successfully. "
-msgstr "Has desbloqueado %s correctamente."
+msgstr "Has desbloqueado %s correctamente. "
 #: app/controllers/public/profile_controller.rb:163
 msgid "You are not allowed to unblock enterprises in this environment."
@@ -4882,8 +4873,8 @@ msgstr &quot;Administradores actuales&quot;
 #: app/controllers/my_profile/profile_members_controller.rb:147
 msgid "The members list couldn't be updated. Please contact the administrator."
 msgstr ""
-"La lista de miembros no puede ser actualizada. Por favor contacta al "
-"administrador"
+"La lista de miembros no puede ser actualizada. Por favor contacta con el "
+"administrador."
 #: app/controllers/my_profile/profile_members_controller.rb:153
 msgid "The members list was updated."
@@ -5201,7 +5192,7 @@ msgstr &quot;Sin imagen&quot;
 #: app/views/catalog/index.html.erb:46
 msgid "from "
-msgstr "desde"
+msgstr "desde "
 #: app/views/catalog/index.html.erb:47
 msgid "by "
@@ -5834,7 +5825,7 @@ msgstr &quot;Ver tareas procesadas&quot;
 #: app/views/tasks/index.html.erb:60 app/views/tasks/index.html.erb:70
 msgid "Set all to: "
-msgstr "Ajustar todo a:"
+msgstr "Ajustar todo a: "
 #: app/views/box_organizer/_products_block.html.erb:5
 msgid "Select the products that must be shown."
@@ -5879,7 +5870,7 @@ msgstr &quot;Tamaño de la presentación&quot;
 #: app/views/box_organizer/_slideshow_block.html.erb:7
 #: app/views/box_organizer/_highlights_block.html.erb:20
 msgid "Image transition:"
-msgstr "Transición de imagen"
+msgstr "Transición de imagen:"
 #: app/views/box_organizer/_slideshow_block.html.erb:7
 #: app/views/box_organizer/_highlights_block.html.erb:20
@@ -5950,7 +5941,7 @@ msgstr &quot;Calle&quot;
 #: app/views/box_organizer/_location_block.html.erb:5
 msgid "Map Type:"
-msgstr "Tipo de mapa"
+msgstr "Tipo de mapa:"
 #: app/views/box_organizer/_location_block.html.erb:5
 msgid "Road Map"
@@ -5974,11 +5965,11 @@ msgstr &quot;Híbrido&quot;
 #: app/views/box_organizer/edit.html.erb:6
 msgid "Custom title for this block: "
-msgstr "Título personalizado para este bloque"
+msgstr "Título personalizado para este bloque: "
 #: app/views/box_organizer/edit.html.erb:11
 msgid "Display this block:"
-msgstr "Mostrar este bloque"
+msgstr "Mostrar este bloque:"
 #: app/views/box_organizer/edit.html.erb:16
 #, fuzzy
@@ -6205,7 +6196,7 @@ msgstr &quot;Fecha de fin&quot;
 #: app/views/search/_sellers_form.html.erb:5
 msgid "Search in:"
-msgstr "Buscar en: "
+msgstr "Buscar en:"
 # ¿Que es esto?
 #: app/views/search/tags.html.erb:1
@@ -6299,7 +6290,7 @@ msgstr &quot;;&quot;
 #: app/views/search/_full_product.html.erb:71
 #: app/views/shared/product/_qualifiers.html.erb:6
 msgid "cert. "
-msgstr "cert."
+msgstr "cert. "
 #: app/views/search/_article_last_change.html.erb:5
 #, fuzzy
@@ -1173,9 +1173,9 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'add an zero width space every 4 caracters of comment urls' do
     url = 'www.an.url.to.be.splited.com'
-    a = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
+    a = fast_create(TextileArticle, :profile_id => @profile.id, :language => 'en')
     c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
-    get :view_page, :profile => @profile.identifier, :page => [ 'textile' ]
+    get :view_page, :profile => @profile.identifier, :page => a.path
     assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('&#x200B;')
   end
@@ -85,14 +85,4 @@ class ProductCategoryTest &lt; ActiveSupport::TestCase
     assert_equivalent [c1,c3], ProductCategory.by_environment(Environment.default)
   end
-  should 'fetch unique categories by level' do
-    c1 = ProductCategory.create!(:name => 'test cat 1', :environment => Environment.default)
-    c11 = ProductCategory.create!(:name => 'test cat 11', :environment => Environment.default, :parent => c1)
-    c12 = ProductCategory.create!(:name => 'test cat 12', :environment => Environment.default, :parent => c1)
-    c111 = ProductCategory.create!(:name => 'test cat 111', :environment => Environment.default, :parent => c11)
-    c112 = ProductCategory.create!(:name => 'test cat 112', :environment => Environment.default, :parent => c11)
-
-    assert_equivalent ['', 'test-cat-11', 'test-cat-12'], ProductCategory.unique_by_level(2).map(&:filtered_category)
-  end
-
 end
@@ -536,7 +536,6 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'deliver e-mail with activation code after creation' do
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       new_user :email => 'pending@activation.com'
-      process_delayed_job_queue
     end
     assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
   end
@@ -667,7 +666,6 @@ class UserTest &lt; ActiveSupport::TestCase
     env.save
     user = new_user :email => 'pending@activation.com'
-    process_delayed_job_queue
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
       process_delayed_job_queue
@@ -688,7 +686,6 @@ class UserTest &lt; ActiveSupport::TestCase
     env.save
     user = new_user :email => 'pending@activation.com'
-    process_delayed_job_queue
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
       process_delayed_job_queue
@@ -708,7 +705,6 @@ class UserTest &lt; ActiveSupport::TestCase
     env.save
     user = new_user :name => 'John Doe', :email => 'pending@activation.com'
-    process_delayed_job_queue
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
       process_delayed_job_queue
@@ -756,6 +752,14 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal 'quire', user.person.name
   end
+  should 'generate private token' do
+    user = User.new
+    SecureRandom.stubs(:hex).returns('token')
+    user.generate_private_token!
+
+    assert user.private_token, 'token'
+  end
+
   should 'deliver e-mail with activation code when resend was requested and user was not activated' do
     user = new_user :email => 'pending@activation.com'
     activation_code = user.activation_code
	@@ -34,7 +34,7 @@ gem 'slim'		@@ -34,7 +34,7 @@ gem 'slim'
34		34
35	# API dependencies	35	# API dependencies
36	gem 'grape', '~> 0.12'	36	gem 'grape', '~> 0.12'
37	-gem 'grape-entity'	37	+gem 'grape-entity', '= 0.4.8'
38	gem 'grape_logging'	38	gem 'grape_logging'
39	gem 'grape-swagger'	39	gem 'grape-swagger'
40	gem 'swagger-ui_rails'	40	gem 'swagger-ui_rails'
	@@ -48,7 +48,7 @@ gem 'api-pagination', '~> 4.1.1'		@@ -48,7 +48,7 @@ gem 'api-pagination', '~> 4.1.1'
48	# asset pipeline	48	# asset pipeline
49	gem 'uglifier', '>= 1.0.3'	49	gem 'uglifier', '>= 1.0.3'
50	gem 'sass-rails'	50	gem 'sass-rails'
51	-gem 'sprockets-rails', '~> 2.3'	51	+gem 'sprockets-rails', '~> 2.1'
52		52
53	# gems to enable rails3 behaviour	53	# gems to enable rails3 behaviour
54	gem 'protected_attributes'	54	gem 'protected_attributes'
	@@ -230,7 +230,7 @@ GEM		@@ -230,7 +230,7 @@ GEM
230	rack-accept	230	rack-accept
231	rack-mount	231	rack-mount
232	virtus (>= 1.0.0)	232	virtus (>= 1.0.0)
233	- grape-entity (0.5.0)	233	+ grape-entity (0.4.8)
234	activesupport	234	activesupport
235	multi_json (>= 1.3.2)	235	multi_json (>= 1.3.2)
236	grape-swagger (0.10.2)	236	grape-swagger (0.10.2)
	@@ -439,7 +439,7 @@ DEPENDENCIES		@@ -439,7 +439,7 @@ DEPENDENCIES
439	gdata (> 0.0.0)!	439	gdata (> 0.0.0)!
440	gettext (~> 3.1)	440	gettext (~> 3.1)
441	grape (~> 0.12)	441	grape (~> 0.12)
442	- grape-entity	442	+ grape-entity (~> 0.4.8)
443	grape-swagger	443	grape-swagger
444	grape_logging	444	grape_logging
445	honeypot (= 0.0.0)!	445	honeypot (= 0.0.0)!
	@@ -477,7 +477,7 @@ DEPENDENCIES		@@ -477,7 +477,7 @@ DEPENDENCIES
477	selenium-webdriver	477	selenium-webdriver
478	slim	478	slim
479	spring	479	spring
480	- sprockets-rails (~> 2.3)	480	+ sprockets-rails (~> 2.1)
481	swagger-ui_rails	481	swagger-ui_rails
482	test-unit	482	test-unit
483	uglifier (>= 1.0.3)	483	uglifier (>= 1.0.3)
	@@ -505,32 +505,6 @@ module ApplicationHelper		@@ -505,32 +505,6 @@ module ApplicationHelper
505	sex	505	sex
506	end	506	end
507		507
508	- def profile_cat_icons( profile )
509	- if profile.class == Enterprise
510	- icons = profile.product_categories.unique_by_level(2).limit(3).map do \|c\|
511	- filtered_category = c.filtered_category.blank? ? c.path.split('/').last : c.filtered_category
512	- category_title = filtered_category.split(/[-_\s,.;'"]+/).map(&:capitalize).join(' ')
513	- category_name = category_title.gsub(' ', '_' )
514	- category_icon = "/images/icons-cat/#{category_name}.png"
515	- if ! File.exists?(Rails.root.join('public', category_icon))
516	- category_icon = '/images/icons-cat/undefined.png'
517	- end
518	- content_tag('span',
519	- content_tag( 'span', category_title ),
520	- :title => category_title,
521	- :class => 'product-cat-icon cat_icon_' + category_name,
522	- :style => "background-image:url(#{category_icon})"
523	- )
524	- end.join("\n").html_safe
525	- content_tag('div',
526	- content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
527	- :class => 'product-category-icons'
528	- )
529	- else
530	- ''
531	- end
532	- end
533	-
534	def links_for_balloon(profile)	508	def links_for_balloon(profile)
535	if environment.enabled?(:show_balloon_with_profile_links_when_clicked)	509	if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
536	if profile.kind_of?(Person)	510	if profile.kind_of?(Person)
	@@ -589,7 +563,7 @@ module ApplicationHelper		@@ -589,7 +563,7 @@ module ApplicationHelper
589	link_to(	563	link_to(
590	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +	564	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
591	content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +	565	content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
592	- extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),	566	+ extra_info + profile_sex_icon( profile ),
593	profile.url,	567	profile.url,
594	:class => 'profile_link url',	568	:class => 'profile_link url',
595	:help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,	569	:help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
	@@ -34,7 +34,6 @@ require_relative '../../find_by_contents'		@@ -34,7 +34,6 @@ require_relative '../../find_by_contents'
34	def current_user	34	def current_user
35	private_token = (params[PRIVATE_TOKEN_PARAM] \|\| headers['Private-Token']).to_s	35	private_token = (params[PRIVATE_TOKEN_PARAM] \|\| headers['Private-Token']).to_s
36	@current_user \|\|= User.find_by_private_token(private_token)	36	@current_user \|\|= User.find_by_private_token(private_token)
37	- @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
38	@current_user	37	@current_user
39	end	38	end
40		39
	@@ -111,7 +111,8 @@ def run_test(name, files)		@@ -111,7 +111,8 @@ def run_test(name, files)
111	end	111	end
112		112
113	def run_minitest files	113	def run_minitest files
114	- sh 'ruby', '-Itest', *files	114	+ files = files.map{\|f\| File.join(Rails.root, f)}
		115	+ sh 'ruby', '-Itest', '-e ARGV.each{\|f\| require f}', *files
115	end	116	end
116		117
117	def run_cucumber(profile, files)	118	def run_cucumber(profile, files)
	@@ -99,9 +99,9 @@ msgid ""		@@ -99,9 +99,9 @@ msgid ""
99	" about your request."	99	" about your request."
100	msgstr ""	100	msgstr ""
101	"Seu pedido para comentar em %{target} foi\n"	101	"Seu pedido para comentar em %{target} foi\n"
102	-" enviado. O administrador irá recebê-lo e aprovarou\n"	102	+" enviado. O administrador irá recebê-lo e aprovar ou\n"
103	" rejeitar seu pedido de acordo com seus métodos e critérios.\n"	103	" rejeitar seu pedido de acordo com seus métodos e critérios.\n"
104	-" Você será notificado assim que o administrador tenha umaposição\n"	104	+" Você será notificado assim que o administrador tenha uma posição\n"
105	" sobre seu pedido."	105	" sobre seu pedido."
106		106
107	#: plugins/organization_ratings/lib/create_organization_rating_comment.rb:112	107	#: plugins/organization_ratings/lib/create_organization_rating_comment.rb:112
	@@ -220,7 +220,7 @@ msgstr "Veja mais"		@@ -220,7 +220,7 @@ msgstr "Veja mais"
220		220
221	#: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:4	221	#: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:4
222	msgid "Rating: "	222	msgid "Rating: "
223	-msgstr "Avaliação:"	223	+msgstr "Avaliação: "
224		224
225	#: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:18	225	#: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:18
226	msgid "Be the first to rate!"	226	msgid "Be the first to rate!"
	@@ -28,9 +28,9 @@ class RemoteUserPlugin < Noosfero::Plugin		@@ -28,9 +28,9 @@ class RemoteUserPlugin < Noosfero::Plugin
28	end	28	end
29		29
30	if !logged_in?	30	if !logged_in?
31	- self.current_user = User.find_by_login(remote_user)	31	+ self.current_user = User.where(environment_id: environment, login: remote_user).first
32	unless self.current_user	32	unless self.current_user
33	- self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))	33	+ self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
34	self.current_user.activate	34	self.current_user.activate
35	end	35	end
36	self.current_user.save!	36	self.current_user.save!
	@@ -39,9 +39,9 @@ class RemoteUserPlugin < Noosfero::Plugin		@@ -39,9 +39,9 @@ class RemoteUserPlugin < Noosfero::Plugin
39	self.current_user.forget_me	39	self.current_user.forget_me
40	reset_session	40	reset_session
41		41
42	- self.current_user = User.find_by_login(remote_user)	42	+ self.current_user = User.where(environment_id: environment, login: remote_user).first
43	unless self.current_user	43	unless self.current_user
44	- self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))	44	+ self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
45	self.current_user.activate	45	self.current_user.activate
46	end	46	end
47	self.current_user.save!	47	self.current_user.save!
	@@ -6,6 +6,10 @@ class AccountControllerTest < ActionController::TestCase		@@ -6,6 +6,10 @@ class AccountControllerTest < ActionController::TestCase
6	@environment.enabled_plugins = ['RemoteUserPlugin']	6	@environment.enabled_plugins = ['RemoteUserPlugin']
7	@environment.save	7	@environment.save
8		8
		9	+ @another_environment = Environment.new(name: "AnotherEnvironment")
		10	+ @another_environment.enabled_plugins = ['RemoteUserPlugin']
		11	+ @another_environment.save
		12	+
9	@controller = AccountController.new	13	@controller = AccountController.new
10	@request = ActionController::TestRequest.new	14	@request = ActionController::TestRequest.new
11	@response = ActionController::TestResponse.new	15	@response = ActionController::TestResponse.new
	@@ -136,4 +140,26 @@ class AccountControllerTest < ActionController::TestCase		@@ -136,4 +140,26 @@ class AccountControllerTest < ActionController::TestCase
136	assert session[:user].blank?	140	assert session[:user].blank?
137	assert_response 404	141	assert_response 404
138	end	142	end
		143	+
		144	+ should "create an user in the correct environment" do
		145	+ @controller.stubs(:environment).returns(@another_environment)
		146	+ @request.env["HTTP_REMOTE_USER"] = "testuser"
		147	+
		148	+ get :index
		149	+ user = User.last
		150	+ assert_equal user.environment, @another_environment
		151	+ end
		152	+
		153	+ should "create an user in both environments" do
		154	+ user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
		155	+ @controller.stubs(:environment).returns(@another_environment)
		156	+ @request.env["HTTP_REMOTE_USER"] = "testuser"
		157	+
		158	+ users = User.where(:login => 'testuser')
		159	+ assert_equal users.count, 1
		160	+
		161	+ get :index
		162	+ users = User.where(:login => 'testuser')
		163	+ assert_equal users.count, 2
		164	+ end
139	end	165	end
	@@ -1173,9 +1173,9 @@ class ContentViewerControllerTest < ActionController::TestCase		@@ -1173,9 +1173,9 @@ class ContentViewerControllerTest < ActionController::TestCase
1173		1173
1174	should 'add an zero width space every 4 caracters of comment urls' do	1174	should 'add an zero width space every 4 caracters of comment urls' do
1175	url = 'www.an.url.to.be.splited.com'	1175	url = 'www.an.url.to.be.splited.com'
1176	- a = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')	1176	+ a = fast_create(TextileArticle, :profile_id => @profile.id, :language => 'en')
1177	c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)	1177	c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
1178	- get :view_page, :profile => @profile.identifier, :page => [ 'textile' ]	1178	+ get :view_page, :profile => @profile.identifier, :page => a.path
1179	assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('')	1179	assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('')
1180	end	1180	end
1181		1181
	@@ -85,14 +85,4 @@ class ProductCategoryTest < ActiveSupport::TestCase		@@ -85,14 +85,4 @@ class ProductCategoryTest < ActiveSupport::TestCase
85	assert_equivalent [c1,c3], ProductCategory.by_environment(Environment.default)	85	assert_equivalent [c1,c3], ProductCategory.by_environment(Environment.default)
86	end	86	end
87		87
88	- should 'fetch unique categories by level' do
89	- c1 = ProductCategory.create!(:name => 'test cat 1', :environment => Environment.default)
90	- c11 = ProductCategory.create!(:name => 'test cat 11', :environment => Environment.default, :parent => c1)
91	- c12 = ProductCategory.create!(:name => 'test cat 12', :environment => Environment.default, :parent => c1)
92	- c111 = ProductCategory.create!(:name => 'test cat 111', :environment => Environment.default, :parent => c11)
93	- c112 = ProductCategory.create!(:name => 'test cat 112', :environment => Environment.default, :parent => c11)
94	-
95	- assert_equivalent ['', 'test-cat-11', 'test-cat-12'], ProductCategory.unique_by_level(2).map(&:filtered_category)
96	- end
97	-
98	end	88	end