Merge branch 'api' of https://gitlab.com/participa/noosfero into api

Evandro Junior
2 parents eea77aea 64557f2e
Showing 4 changed files with 36 additions and 22 deletions Show diff stats
lib/noosfero/api/api.rb
lib/noosfero/api/helpers.rb
test/unit/api/users_test.rb
test/unit/user_test.rb
@@ -11,9 +11,9 @@ module Noosfero
       logger.formatter = GrapeLogging::Formatters::Default.new
       use GrapeLogging::Middleware::RequestLogger, { logger: logger }
-      rescue_from :all do |e|
-        logger.error e
-      end
+      #rescue_from :all do |e|
+      #  logger.error e
+      #end
       @@NOOSFERO_CONF = nil
       def self.NOOSFERO_CONF
@@ -25,6 +25,7 @@ module Noosfero
         end
       end
+      before { set_locale  }
       before { setup_multitenancy }
       before { detect_stuff_by_domain }
       before { filter_disabled_plugins_endpoints }
@@ -7,6 +7,10 @@
       include SanitizeParams
+      def set_locale
+        I18n.locale = (params[:lang] || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
+      end
+      
       def current_user
         private_token = (params[PRIVATE_TOKEN_PARAM] || headers['Private-Token']).to_s
         @current_user ||= User.find_by_private_token(private_token)
+# encoding: UTF-8
 require File.dirname(__FILE__) + '/test_helper'
 class UsersTest < ActiveSupport::TestCase
@@ -19,6 +20,18 @@ class UsersTest &lt; ActiveSupport::TestCase
     assert_equal 'some', json['user']['login']
   end
+  should 'not create duplicate user' do
+    params[:lang] = :"pt-BR"
+    params[:user] = {:login => 'some', :password => '123456', :password_confirmation => '123456', :email => 'some@some.com'}
+    post "/api/v1/users?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 'some', json['user']['login']
+    params[:user] = {:login => 'some', :password => '123456', :password_confirmation => '123456', :email => 'some@some.com'}
+    post "/api/v1/users?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 'Username / Email já está em uso,e-Mail já está em uso', json['message']
+  end
+
   should 'return 400 status for invalid user creation' do
     params[:user] = {:login => 'some'}
     post "/api/v1/users?#{params.to_query}"
@@ -21,6 +21,14 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  def test_should_not_allow_duplicate_login
+    user1 = create_user('new_user', :email => 'new_user1@example.com', :password => 'test', :password_confirmation => 'test')
+    assert !user1.errors[:login].present?
+    user1.save!
+    user2 = new_user(:login => 'new_user')
+    assert user2.errors[:login].present?
+  end
+
   def test_should_require_password
     assert_no_difference 'User.count' do
       u = new_user(:password => nil)
@@ -42,6 +50,13 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  def test_email_format
+    assert_no_difference 'User.count' do
+      u = new_user(:email => 'test.email')
+      assert u.errors[:email].present?
+    end
+  end
+
   def test_should_reset_password
     users(:johndoe).update_attributes(:password => 'new password', :password_confirmation => 'new password')
     assert_equal users(:johndoe), User.authenticate('johndoe', 'new password')
@@ -715,25 +730,6 @@ 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 'check for private token validity' do
-    user = User.new
-    assert user.private_token_expired?
-
-    user.generate_private_token!
-    assert !user.private_token_expired?
-
-    user.private_token_generated_at = DateTime.now - (User::TOKEN_VALIDITY + 1.minute)
-    assert user.private_token_expired?
-  end
-
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
		1	+# encoding: UTF-8
1	require File.dirname(__FILE__) + '/test_helper'	2	require File.dirname(__FILE__) + '/test_helper'
2		3
3	class UsersTest < ActiveSupport::TestCase	4	class UsersTest < ActiveSupport::TestCase
	@@ -19,6 +20,18 @@ class UsersTest < ActiveSupport::TestCase		@@ -19,6 +20,18 @@ class UsersTest < ActiveSupport::TestCase
19	assert_equal 'some', json['user']['login']	20	assert_equal 'some', json['user']['login']
20	end	21	end
21		22
		23	+ should 'not create duplicate user' do
		24	+ params[:lang] = :"pt-BR"
		25	+ params[:user] = {:login => 'some', :password => '123456', :password_confirmation => '123456', :email => 'some@some.com'}
		26	+ post "/api/v1/users?#{params.to_query}"
		27	+ json = JSON.parse(last_response.body)
		28	+ assert_equal 'some', json['user']['login']
		29	+ params[:user] = {:login => 'some', :password => '123456', :password_confirmation => '123456', :email => 'some@some.com'}
		30	+ post "/api/v1/users?#{params.to_query}"
		31	+ json = JSON.parse(last_response.body)
		32	+ assert_equal 'Username / Email já está em uso,e-Mail já está em uso', json['message']
		33	+ end
		34	+
22	should 'return 400 status for invalid user creation' do	35	should 'return 400 status for invalid user creation' do
23	params[:user] = {:login => 'some'}	36	params[:user] = {:login => 'some'}
24	post "/api/v1/users?#{params.to_query}"	37	post "/api/v1/users?#{params.to_query}"