Merge branch 'staging' into production

Leandro Santos
2 parents 38a62d97 9bca97e7
Showing 3 changed files with 7 additions and 7 deletions Show diff stats
plugins/juventude
test/unit/api/helpers_test.rb
test/unit/block_test.rb
-Subproject commit 175e64b797bf62b6c5d3794919142c34794cbb36
+Subproject commit 1fe29568d853971cd91fc65025d618cb6b43b05b
@@ -26,13 +26,13 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     assert_equal user, current_user
   end
  
-  should 'not get the current user with expired token' do
+  should 'get the current user even with expired token' do
     user = create_user('someuser')
     user.generate_private_token!
     user.private_token_generated_at = DateTime.now.prev_year
     user.save
     self.params = {:private_token => user.private_token}
-    assert_nil current_user
+    assert_equal user, current_user
   end
  
   should 'get the person of current user' do
@@ -364,22 +364,22 @@ class BlockTest &lt; ActiveSupport::TestCase
  
   should 'return the icon block path' do
     class NewBlock < Block; end
-    assert_equal 'blocks/new_block/icon.png', NewBlock.icon_path
+    assert_equal 'images/blocks/new_block/icon.png', NewBlock.icon_path
   end
  
   should 'return the icon block path for blocks inside modules' do
     module SomeModule class NewBlock < Block; end; end
-    assert_equal 'blocks/new_block/icon.png', SomeModule::NewBlock.icon_path
+    assert_equal 'images/blocks/new_block/icon.png', SomeModule::NewBlock.icon_path
   end
  
   should 'return the default icon for blocks without icon' do
     class NewBlock < Block; end
-    assert_equal 'icon_block.png', NewBlock.default_icon_path
+    assert_equal '/images/icon_block.png', NewBlock.default_icon_path
   end
  
   should 'return the default preview path for blocks without preview images' do
     class NewBlock < Block; end
-    assert_equal 'block_preview.png', NewBlock.default_preview_path
+    assert_equal '/images/block_preview.png', NewBlock.default_preview_path
   end
  
   should 'get limit as a number when limit is string' do
1		-Subproject commit 175e64b797bf62b6c5d3794919142c34794cbb36
	1	+Subproject commit 1fe29568d853971cd91fc65025d618cb6b43b05b
...	...
...	...	@@ -26,13 +26,13 @@ class APIHelpersTest < ActiveSupport::TestCase
26	26	assert_equal user, current_user
27	27	end
28	28
29		- should 'not get the current user with expired token' do
	29	+ should 'get the current user even with expired token' do
30	30	user = create_user('someuser')
31	31	user.generate_private_token!
32	32	user.private_token_generated_at = DateTime.now.prev_year
33	33	user.save
34	34	self.params = {:private_token => user.private_token}
35		- assert_nil current_user
	35	+ assert_equal user, current_user
36	36	end
37	37
38	38	should 'get the person of current user' do
...	...
...	...	@@ -364,22 +364,22 @@ class BlockTest < ActiveSupport::TestCase
364	364
365	365	should 'return the icon block path' do
366	366	class NewBlock < Block; end
367		- assert_equal 'blocks/new_block/icon.png', NewBlock.icon_path
	367	+ assert_equal 'images/blocks/new_block/icon.png', NewBlock.icon_path
368	368	end
369	369
370	370	should 'return the icon block path for blocks inside modules' do
371	371	module SomeModule class NewBlock < Block; end; end
372		- assert_equal 'blocks/new_block/icon.png', SomeModule::NewBlock.icon_path
	372	+ assert_equal 'images/blocks/new_block/icon.png', SomeModule::NewBlock.icon_path
373	373	end
374	374
375	375	should 'return the default icon for blocks without icon' do
376	376	class NewBlock < Block; end
377		- assert_equal 'icon_block.png', NewBlock.default_icon_path
	377	+ assert_equal '/images/icon_block.png', NewBlock.default_icon_path
378	378	end
379	379
380	380	should 'return the default preview path for blocks without preview images' do
381	381	class NewBlock < Block; end
382		- assert_equal 'block_preview.png', NewBlock.default_preview_path
	382	+ assert_equal '/images/block_preview.png', NewBlock.default_preview_path
383	383	end
384	384
385	385	should 'get limit as a number when limit is string' do
...	...