rails3: fix unit tests

Victor Costa
1 parent 59d5b8f6
Showing 18 changed files with 63 additions and 74 deletions Show diff stats
app/helpers/application_helper.rb
app/models/block.rb
app/models/forum.rb
app/models/product_categories_block.rb
app/models/profile.rb
app/views/comment/_comment_actions.html.erb
app/views/comment/_comment_actions.rhtml
app/views/search/_sellers_form.html.erb
lib/scope_tool.rb
lib/tasks/plugins.rake
test/factories.rb
test/unit/application_helper_test.rb
test/unit/article_test.rb
test/unit/block_test.rb
test/unit/box_test.rb
test/unit/catalog_helper_test.rb
test/unit/forum_test.rb
test/unit/person_test.rb
@@ -295,7 +295,7 @@ module ApplicationHelper
       search_name = "_" + search_name
     end
-    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + 'html.erb') : File.join(view_path, search_name + 'html.erb')
+    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
     return name if File.exists?(File.join(path))
     partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
@@ -403,7 +403,7 @@ module ApplicationHelper
   def theme_view_file(template)
     # Since we cannot control what people are doing in external themes, we
     # will keep looking for the deprecated .rhtml extension here.
-    file = Rails.root.join('public', theme_path[1..-1], template + 'html.erb')
+    file = Rails.root.join('public', theme_path[1..-1], template + '.html.erb')
     return file if File.exists?(file)
     nil
   end
@@ -167,10 +167,10 @@ class Block &lt; ActiveRecord::Base
   end
   DISPLAY_OPTIONS = {
-    'always'           => __('In all pages'),
-    'home_page_only'   => __('Only in the homepage'),
-    'except_home_page' => __('In all pages, except in the homepage'),
-    'never'            => __('Don\'t display'),
+    'always'           => _('In all pages'),
+    'home_page_only'   => _('Only in the homepage'),
+    'except_home_page' => _('In all pages, except in the homepage'),
+    'never'            => _('Don\'t display'),
   }
   def display_options
@@ -182,7 +182,7 @@ class Block &lt; ActiveRecord::Base
   end
   def duplicate
-    duplicated_block = self.clone
+    duplicated_block = self.dup
     duplicated_block.display = 'never'
     duplicated_block.created_at = nil
     duplicated_block.updated_at = nil
@@ -3,6 +3,8 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
+  attr_accessible :has_terms_of_use
+
   settings_items :terms_of_use, :type => :string, :default => ""
   settings_items :has_terms_of_use, :type => :boolean, :default => false
   has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
@@ -33,7 +33,7 @@ class ProductCategoriesBlock &lt; Block
     end
   end
-  DISPLAY_OPTIONS['catalog_only'] = __('Only on the catalog')
+  DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')
   def display
     settings[:display].nil? ? 'catalog_only' : super
@@ -92,21 +92,8 @@ class Profile &lt; ActiveRecord::Base
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
-# FIXME Review this change after the refactoring on or_scopes, now done through the ScopeTool.
-#<<<<<<< HEAD
-#
-#    clauses = scopes.map do |relation|
-#      clause = relation.arel.where_clauses.map { |clause| "(#{clause})" }.join(' AND ')
-#      "(#{clause})"
-#    end.join(' OR ')
-#
-#    joins = scopes.map { |relation| relation.joins_values }.flatten.uniq
-#    selects = scopes.map { |relation| relation.select_values }.flatten.uniq
-#    Person.select(selects).joins(joins).where(clauses)
-#=======
     return scopes.first if scopes.size == 1
     ScopeTool.union *scopes
-#>>>>>>> master
   end
   def members_count
@@ -0,0 +1,22 @@
+<ul>
+  <% if !links_submenu.empty? %>
+    <div class="comment-actions">
+      <li class="vcard">
+        <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links_submenu.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
+      </li>
+    </div>
+  <% end %>
+</ul>
+<div class="comments-action-bar">
+  <% unless comment.spam? %>
+    <%= link_to_function '',
+      "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
+      :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
+      :id => 'comment-reply-to-' + comment.id.to_s,
+      :title => _('Reply')
+    %>
+  <% end %>
+  <% links_action_bar.collect do |link| %>
+    <%= link[:link] %>
+  <% end %>
+</div>
@@ -1,22 +0,0 @@
-<ul>
-  <% if !links_submenu.empty? %>
-    <div class="comment-actions">
-      <li class="vcard">
-        <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links_submenu.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
-      </li>
-    </div>
-  <% end %>
-</ul>
-<div class="comments-action-bar">
-  <% unless comment.spam? %>
-    <%= link_to_function '',
-      "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
-      :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
-      :id => 'comment-reply-to-' + comment.id.to_s,
-      :title => _('Reply')
-    %>
-  <% end %>
-  <% links_action_bar.collect do |link| %>
-    <%= link[:link] %>
-  <% end %>
-</div>
@@ -4,7 +4,7 @@
   <div class="search-in-opt"><%= _('Search in:') %>
     <dir>
-      <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %><br />
+      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
       <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
     </dir>
   </div>
@@ -2,7 +2,7 @@ module ScopeTool
   # Sum scope results by SQL, allowing post filtering of the group.
   def union(*scopes)
-    model = scopes.first.class_name.constantize
+    model = scopes.first.klass.name.constantize
     scopes = scopes.map &:to_sql
     model.from "(\n#{scopes.join("\nUNION\n")}\n) as #{model.table_name}"
   end
 require 'active_record'
-require_dependency 'active_record/migration'
+#require_dependency 'active_record/migration'
 class ActiveRecord::Migrator
   alias_method :orig_initialize, :initialize
@@ -42,7 +42,11 @@ module Noosfero::Factory
     attrs[:slug] = attrs[:name].to_slug if attrs[:name].present? && attrs[:slug].blank? && defaults[:slug].present?
     data = defaults_for(name).merge(attrs)
     object = name.to_s.camelize.constantize.new
-    object.assign_attributes(data, :without_protection => true)
+    if object.respond_to?(:assign_attributes)
+      object.assign_attributes(data, :without_protection => true)
+    else
+      data.each { |attribute, value| object.send(attribute.to_s+'=', value) }
+    end
     object
  end
@@ -18,7 +18,7 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     self.stubs(:params).returns({:controller => 'test'})
     File.stubs(:exists?).returns(false)
-    File.expects(:exists?).with(p1+"test/_integer.rhtml").returns(true)
+    File.expects(:exists?).with(p1+"test/_integer.html.erb").returns(true)
     assert_equal 'integer', partial_for_class(Integer)
     File.expects(:exists?).with(p1+"test/_numeric.html.erb").returns(true)
@@ -38,7 +38,7 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     class School; class Project; end; end
     File.stubs(:exists?).returns(false)
-    File.expects(:exists?).with(p+"test/application_helper_test/school/_project.rhtml").returns(true)
+    File.expects(:exists?).with(p+"test/application_helper_test/school/_project.html.erb").returns(true)
     assert_equal 'test/application_helper_test/school/project', partial_for_class(School::Project)
   end
@@ -175,7 +175,7 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   should 'render theme footer' do
     stubs(:theme_path).returns('/user_themes/mytheme')
-    footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.rhtml')
+    footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.html.erb')
     File.expects(:exists?).with(footer_path).returns(true)
     expects(:render).with(:file => footer_path, :use_full_path => false).returns("BLI")
@@ -185,11 +185,9 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   should 'ignore unexisting theme footer' do
     stubs(:theme_path).returns('/user_themes/mytheme')
-    footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.rhtml')
-    alternate_footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.html.erb')
+    footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.html.erb')
     File.expects(:exists?).with(footer_path).returns(false)
-    File.expects(:exists?).with(alternate_footer_path).returns(false)
     expects(:render).with(:file => footer).never
     assert_nil theme_footer
@@ -197,7 +195,7 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   should 'render theme site title' do
     stubs(:theme_path).returns('/user_themes/mytheme')
-    site_title_path = Rails.root.join('public', 'user_themes', 'mytheme', 'site_title.rhtml')
+    site_title_path = Rails.root.join('public', 'user_themes', 'mytheme', 'site_title.html.erb')
     File.expects(:exists?).with(site_title_path).returns(true)
     expects(:render).with(:file => site_title_path, :use_full_path => false).returns("Site title")
@@ -207,11 +205,9 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   should 'ignore unexisting theme site title' do
     stubs(:theme_path).returns('/user_themes/mytheme')
-    site_title_path = Rails.root.join('public', 'user_themes', 'mytheme', 'site_title.rhtml')
-    alternate_site_title_path = Rails.root.join('public', 'user_themes', 'mytheme', 'site_title.html.erb')
+    site_title_path = Rails.root.join('public', 'user_themes', 'mytheme', 'site_title.html.erb')
     File.expects(:exists?).with(site_title_path).returns(false)
-    File.expects(:exists?).with(alternate_site_title_path).returns(false)
     expects(:render).with(:file => site_title_path).never
     assert_nil theme_site_title
@@ -1697,7 +1697,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'return license from a specific version' do
     cc = License.create!(:name => 'CC (by)', :environment => Environment.default)
     gpl = License.create!(:name => 'GPLv3', :environment => Environment.default)
-    article = Article.create!(:name => 'first version', :profile => profile, :license => cc)
+    article = create(Article, :name => 'first version', :profile => profile, :license => cc)
     article.license = gpl
     article.save
     assert_equal cc, article.version_license(1)
@@ -1766,7 +1766,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should "return the author of a specific version" do
     author1 = fast_create(Person)
     author2 = fast_create(Person)
-    article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)
+    article = create(Article, :name => 'first version', :profile => profile, :last_changed_by => author1)
     article.name = 'second version'
     article.last_changed_by = author2
     article.save
@@ -1777,7 +1777,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should "return the author_name of a specific version" do
     author1 = fast_create(Person)
     author2 = fast_create(Person)
-    article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)
+    article = create(Article, :name => 'first version', :profile => profile, :last_changed_by => author1)
     article.name = 'second version'
     article.last_changed_by = author2
     article.save
@@ -169,14 +169,14 @@ class BlockTest &lt; ActiveSupport::TestCase
   should 'create a cloned block' do
     block = fast_create(Block, :title => 'test 1', :position => 1)
-    assert_difference Block, :count, 1 do
+    assert_difference 'Block.count', 1 do
       block.duplicate
     end
   end
   should 'clone and keep some fields' do
     box = fast_create(Box, :owner_id => fast_create(Profile).id)
-    block = TagsBlock.create!(:title => 'test 1', :box_id => box.id, :settings => {:test => 'test'})
+    block = create(TagsBlock, :title => 'test 1', :box_id => box.id, :settings => {:test => 'test'})
     duplicated = block.duplicate
     [:title, :box_id, :type].each do |f|
       assert_equal duplicated.send(f), block.send(f)
@@ -186,8 +186,8 @@ class BlockTest &lt; ActiveSupport::TestCase
   should 'clone block and set fields' do
     box = fast_create(Box, :owner_id => fast_create(Profile).id)
-    block = TagsBlock.create!(:title => 'test 1', :box_id => box.id, :settings => {:test => 'test'}, :position => 1)
-    block2 = TagsBlock.create!(:title => 'test 2', :box_id => box.id, :settings => {:test => 'test'}, :position => 2)
+    block = create(TagsBlock, :title => 'test 1', :box_id => box.id, :settings => {:test => 'test'}, :position => 1)
+    block2 = create(TagsBlock, :title => 'test 2', :box_id => box.id, :settings => {:test => 'test'}, :position => 2)
     duplicated = block.duplicate
     block2.reload
     block.reload
@@ -198,8 +198,8 @@ class BlockTest &lt; ActiveSupport::TestCase
   end
   should 'not clone date creation and update attributes' do
-     box = fast_create(Box, :owner_id => fast_create(Profile).id)
-    block = TagsBlock.create!(:title => 'test 1', :box_id => box.id, :settings => {:test => 'test'}, :position => 1)
+    box = fast_create(Box, :owner_id => fast_create(Profile).id)
+    block = create(TagsBlock, :title => 'test 1', :box_id => box.id, :settings => {:test => 'test'}, :position => 1)
     duplicated = block.duplicate
       assert_not_equal block.created_at, duplicated.created_at
@@ -96,7 +96,7 @@ class BoxTest &lt; ActiveSupport::TestCase
       end
     end
     class PluginBlock < Block
-      def self.name; 'plugin-block'; end
+      def self.to_s; 'plugin-block'; end
     end
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
@@ -111,7 +111,7 @@ class BoxTest &lt; ActiveSupport::TestCase
       end
     end
     class PluginBlock < Block
-      def self.name; 'plugin-block'; end
+      def self.to_s; 'plugin-block'; end
     end
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
@@ -130,13 +130,13 @@ class BoxTest &lt; ActiveSupport::TestCase
     end
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
-    blocks = Box.new(:position => 1, :owner => Person.new).acceptable_blocks
+    blocks = build(Box, :position => 1, :owner => Person.new).acceptable_blocks
     assert blocks.include?('box-test_plugin-block')
-    blocks = Box.new(:position => 1, :owner => Enterprise.new).acceptable_blocks
+    blocks = build(Box, :position => 1, :owner => Enterprise.new).acceptable_blocks
     assert blocks.include?('box-test_plugin-block')
-    blocks = Box.new(:position => 1, :owner => Community.new).acceptable_blocks
+    blocks = build(Box, :position => 1, :owner => Community.new).acceptable_blocks
     assert !blocks.include?('box-test_plugin-block')
   end
@@ -6,7 +6,7 @@ class CatalogHelperTest &lt; ActiveSupport::TestCase
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
-  include ActionController::Assertions::SelectorAssertions
+  include ActionDispatch::Assertions::SelectorAssertions
   def url_for(opts)
     #{:controller => 'catalog', :action => 'index', :level => category.id}
@@ -137,7 +137,7 @@ class ForumTest &lt; ActiveSupport::TestCase
   should 'include user that changes a forum as agreed with terms' do
     author = fast_create(Person)
     editor = fast_create(Person)
-    forum = Forum.create(:profile => author, :name => 'Forum test', :body => 'Forum test', :has_terms_of_use => true, :last_changed_by => author)
+    forum = create(Forum, :profile => author, :name => 'Forum test', :body => 'Forum test', :has_terms_of_use => true, :last_changed_by => author)
     forum.last_changed_by = editor
     forum.save
@@ -1444,7 +1444,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_includes original_person.memberships, original_cmm
     assert_includes original_person.memberships, plugin1_cmm
     assert_includes original_person.memberships, plugin2_cmm
-    assert 3, original_person.memberships.count
+    assert_equal 3, original_person.memberships.count
   end
 end
	@@ -295,7 +295,7 @@ module ApplicationHelper		@@ -295,7 +295,7 @@ module ApplicationHelper
295	search_name = "_" + search_name	295	search_name = "_" + search_name
296	end	296	end
297		297
298	- path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + 'html.erb') : File.join(view_path, search_name + 'html.erb')	298	+ path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
299	return name if File.exists?(File.join(path))	299	return name if File.exists?(File.join(path))
300		300
301	partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)	301	partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
	@@ -403,7 +403,7 @@ module ApplicationHelper		@@ -403,7 +403,7 @@ module ApplicationHelper
403	def theme_view_file(template)	403	def theme_view_file(template)
404	# Since we cannot control what people are doing in external themes, we	404	# Since we cannot control what people are doing in external themes, we
405	# will keep looking for the deprecated .rhtml extension here.	405	# will keep looking for the deprecated .rhtml extension here.
406	- file = Rails.root.join('public', theme_path[1..-1], template + 'html.erb')	406	+ file = Rails.root.join('public', theme_path[1..-1], template + '.html.erb')
407	return file if File.exists?(file)	407	return file if File.exists?(file)
408	nil	408	nil
409	end	409	end
	@@ -33,7 +33,7 @@ class ProductCategoriesBlock < Block		@@ -33,7 +33,7 @@ class ProductCategoriesBlock < Block
33	end	33	end
34	end	34	end
35		35
36	- DISPLAY_OPTIONS['catalog_only'] = __('Only on the catalog')	36	+ DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')
37		37
38	def display	38	def display
39	settings[:display].nil? ? 'catalog_only' : super	39	settings[:display].nil? ? 'catalog_only' : super
	@@ -92,21 +92,8 @@ class Profile < ActiveRecord::Base		@@ -92,21 +92,8 @@ class Profile < ActiveRecord::Base
92	def members	92	def members
93	scopes = plugins.dispatch_scopes(:organization_members, self)	93	scopes = plugins.dispatch_scopes(:organization_members, self)
94	scopes << Person.members_of(self)	94	scopes << Person.members_of(self)
95	-# FIXME Review this change after the refactoring on or_scopes, now done through the ScopeTool.
96	-#<<<<<<< HEAD
97	-#
98	-# clauses = scopes.map do \|relation\|
99	-# clause = relation.arel.where_clauses.map { \|clause\| "(#{clause})" }.join(' AND ')
100	-# "(#{clause})"
101	-# end.join(' OR ')
102	-#
103	-# joins = scopes.map { \|relation\| relation.joins_values }.flatten.uniq
104	-# selects = scopes.map { \|relation\| relation.select_values }.flatten.uniq
105	-# Person.select(selects).joins(joins).where(clauses)
106	-#=======
107	return scopes.first if scopes.size == 1	95	return scopes.first if scopes.size == 1
108	ScopeTool.union *scopes	96	ScopeTool.union *scopes
109	-#>>>>>>> master
110	end	97	end
111		98
112	def members_count	99	def members_count
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+<ul>
	2	+ <% if !links_submenu.empty? %>
	3	+ <div class="comment-actions">
	4	+ <li class="vcard">
	5	+ <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links_submenu.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
	6	+ </li>
	7	+ </div>
	8	+ <% end %>
	9	+</ul>
	10	+<div class="comments-action-bar">
	11	+ <% unless comment.spam? %>
	12	+ <%= link_to_function '',
	13	+ "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
	14	+ :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
	15	+ :id => 'comment-reply-to-' + comment.id.to_s,
	16	+ :title => _('Reply')
	17	+ %>
	18	+ <% end %>
	19	+ <% links_action_bar.collect do \|link\| %>
	20	+ <%= link[:link] %>
	21	+ <% end %>
	22	+</div>
	@@ -1,22 +0,0 @@	@@ -1,22 +0,0 @@
1	-<ul>
2	- <% if !links_submenu.empty? %>
3	- <div class="comment-actions">
4	- <li class="vcard">
5	- <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links_submenu.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
6	- </li>
7	- </div>
8	- <% end %>
9	-</ul>
10	-<div class="comments-action-bar">
11	- <% unless comment.spam? %>
12	- <%= link_to_function '',
13	- "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
14	- :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
15	- :id => 'comment-reply-to-' + comment.id.to_s,
16	- :title => _('Reply')
17	- %>
18	- <% end %>
19	- <% links_action_bar.collect do \|link\| %>
20	- <%= link[:link] %>
21	- <% end %>
22	-</div>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4		4
5	<div class="search-in-opt"><%= _('Search in:') %>	5	<div class="search-in-opt"><%= _('Search in:') %>
6	<dir>	6	<dir>
7	- <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %><br />	7	+ <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
8	<%= labelled_radio_button _('Products'), 'asset', 'products', false %>	8	<%= labelled_radio_button _('Products'), 'asset', 'products', false %>
9	</dir>	9	</dir>
10	</div>	10	</div>
	@@ -2,7 +2,7 @@ module ScopeTool		@@ -2,7 +2,7 @@ module ScopeTool
2		2
3	# Sum scope results by SQL, allowing post filtering of the group.	3	# Sum scope results by SQL, allowing post filtering of the group.
4	def union(*scopes)	4	def union(*scopes)
5	- model = scopes.first.class_name.constantize	5	+ model = scopes.first.klass.name.constantize
6	scopes = scopes.map &:to_sql	6	scopes = scopes.map &:to_sql
7	model.from "(\n#{scopes.join("\nUNION\n")}\n) as #{model.table_name}"	7	model.from "(\n#{scopes.join("\nUNION\n")}\n) as #{model.table_name}"
8	end	8	end
1	require 'active_record'	1	require 'active_record'
2	-require_dependency 'active_record/migration'	2	+#require_dependency 'active_record/migration'
3		3
4	class ActiveRecord::Migrator	4	class ActiveRecord::Migrator
5	alias_method :orig_initialize, :initialize	5	alias_method :orig_initialize, :initialize
	@@ -1697,7 +1697,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1697,7 +1697,7 @@ class ArticleTest < ActiveSupport::TestCase
1697	should 'return license from a specific version' do	1697	should 'return license from a specific version' do
1698	cc = License.create!(:name => 'CC (by)', :environment => Environment.default)	1698	cc = License.create!(:name => 'CC (by)', :environment => Environment.default)
1699	gpl = License.create!(:name => 'GPLv3', :environment => Environment.default)	1699	gpl = License.create!(:name => 'GPLv3', :environment => Environment.default)
1700	- article = Article.create!(:name => 'first version', :profile => profile, :license => cc)	1700	+ article = create(Article, :name => 'first version', :profile => profile, :license => cc)
1701	article.license = gpl	1701	article.license = gpl
1702	article.save	1702	article.save
1703	assert_equal cc, article.version_license(1)	1703	assert_equal cc, article.version_license(1)
	@@ -1766,7 +1766,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1766,7 +1766,7 @@ class ArticleTest < ActiveSupport::TestCase
1766	should "return the author of a specific version" do	1766	should "return the author of a specific version" do
1767	author1 = fast_create(Person)	1767	author1 = fast_create(Person)
1768	author2 = fast_create(Person)	1768	author2 = fast_create(Person)
1769	- article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)	1769	+ article = create(Article, :name => 'first version', :profile => profile, :last_changed_by => author1)
1770	article.name = 'second version'	1770	article.name = 'second version'
1771	article.last_changed_by = author2	1771	article.last_changed_by = author2
1772	article.save	1772	article.save
	@@ -1777,7 +1777,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1777,7 +1777,7 @@ class ArticleTest < ActiveSupport::TestCase
1777	should "return the author_name of a specific version" do	1777	should "return the author_name of a specific version" do
1778	author1 = fast_create(Person)	1778	author1 = fast_create(Person)
1779	author2 = fast_create(Person)	1779	author2 = fast_create(Person)
1780	- article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)	1780	+ article = create(Article, :name => 'first version', :profile => profile, :last_changed_by => author1)
1781	article.name = 'second version'	1781	article.name = 'second version'
1782	article.last_changed_by = author2	1782	article.last_changed_by = author2
1783	article.save	1783	article.save
	@@ -96,7 +96,7 @@ class BoxTest < ActiveSupport::TestCase		@@ -96,7 +96,7 @@ class BoxTest < ActiveSupport::TestCase
96	end	96	end
97	end	97	end
98	class PluginBlock < Block	98	class PluginBlock < Block
99	- def self.name; 'plugin-block'; end	99	+ def self.to_s; 'plugin-block'; end
100	end	100	end
101	Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])	101	Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
102		102
	@@ -111,7 +111,7 @@ class BoxTest < ActiveSupport::TestCase		@@ -111,7 +111,7 @@ class BoxTest < ActiveSupport::TestCase
111	end	111	end
112	end	112	end
113	class PluginBlock < Block	113	class PluginBlock < Block
114	- def self.name; 'plugin-block'; end	114	+ def self.to_s; 'plugin-block'; end
115	end	115	end
116	Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])	116	Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
117		117
	@@ -130,13 +130,13 @@ class BoxTest < ActiveSupport::TestCase		@@ -130,13 +130,13 @@ class BoxTest < ActiveSupport::TestCase
130	end	130	end
131	Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])	131	Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
132		132
133	- blocks = Box.new(:position => 1, :owner => Person.new).acceptable_blocks	133	+ blocks = build(Box, :position => 1, :owner => Person.new).acceptable_blocks
134	assert blocks.include?('box-test_plugin-block')	134	assert blocks.include?('box-test_plugin-block')
135		135
136	- blocks = Box.new(:position => 1, :owner => Enterprise.new).acceptable_blocks	136	+ blocks = build(Box, :position => 1, :owner => Enterprise.new).acceptable_blocks
137	assert blocks.include?('box-test_plugin-block')	137	assert blocks.include?('box-test_plugin-block')
138		138
139	- blocks = Box.new(:position => 1, :owner => Community.new).acceptable_blocks	139	+ blocks = build(Box, :position => 1, :owner => Community.new).acceptable_blocks
140	assert !blocks.include?('box-test_plugin-block')	140	assert !blocks.include?('box-test_plugin-block')
141	end	141	end
142		142