Merge branch 'master' into rails3

Victor Costa
2 parents b55ea6ae 7b118e80
Showing 5 changed files with 7 additions and 17 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/views/shared/update_categories.js.erb
features/delete_profile.feature
features/upload_files.feature
@@ -232,7 +232,7 @@ class CmsController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
   end
   def publish
@@ -54,7 +54,7 @@ class ProfileEditorController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
   end
   def header_footer
 <%
   content = render :partial => 'shared/select_categories',
-      :locals => {:object_name => 'article', :multiple => true}, :layout => false
+      :locals => {:object_name => object_name, :multiple => true}, :layout => false
 %>
 jQuery('#select-categories').html('<%= j(content) %>');
@@ -13,7 +13,6 @@ Feature: delete profile
       | sample-community | Sample Community |
     And "Maria Silva" is a member of "Sample Community"
-  @selenium
   Scenario: deleting profile
     Given I am logged in as "joaosilva"
     And I am on joaosilva's control panel
@@ -46,7 +45,6 @@ Feature: delete profile
     When I follow "Community Info and settings"
     Then I should see "Delete profile"
-  @selenium
   Scenario: community admin deletes the community
     Given "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
@@ -75,7 +73,6 @@ Feature: delete profile
     When I follow "Enterprise Info and settings"
     Then I should see "Delete profile"
-  @selenium
   Scenario: enterprise admin deletes the enterprise
     Given the following enterprise
       | identifier | name |
@@ -101,7 +98,6 @@ Feature: delete profile
     And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile
     Then I should see "Access denied"
-  @selenium
   Scenario: environment admin deletes profile
     Given I am logged in as admin
     And I am on joaosilva's control panel
@@ -8,7 +8,6 @@ Feature: upload files
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
-  @selenium
   Scenario: provile links to upload files to community's gallery
     Given the following communities
       | identifier | name | owner |
@@ -16,12 +15,9 @@ Feature: upload files
     And the following galleries
       | owner | name |
       | sample-community | Gallery test |
-    And I go to sample-community's profile
-    And I follow "Profile"
-    And I follow "0 pictures"
-    And I should see "Upload files"
+    And I go to article "Gallery test"
+    Then I should see "Upload files"
-  @selenium
   Scenario: provile links to upload files to enterprise's gallery
     Given the following enterprises
       | identifier | name | owner |
@@ -29,10 +25,8 @@ Feature: upload files
     And the following galleries
       | owner | name |
       | sample-enterprise | Gallery test |
-    And I go to sample-enterprise's profile
-    And I follow "Profile"
-    And I follow "0 pictures"
-    And I should see "Upload files"
+    And I go to article "Gallery test"
+    Then I should see "Upload files"
   Scenario: not provile links to upload files on blogs
     Given the following communities
	@@ -232,7 +232,7 @@ class CmsController < MyProfileController		@@ -232,7 +232,7 @@ class CmsController < MyProfileController
232	@current_category = Category.find(params[:category_id])	232	@current_category = Category.find(params[:category_id])
233	@categories = @current_category.children	233	@categories = @current_category.children
234	end	234	end
235	- render :template => 'shared/update_categories', :locals => { :category => @current_category }	235	+ render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
236	end	236	end
237		237
238	def publish	238	def publish
	@@ -54,7 +54,7 @@ class ProfileEditorController < MyProfileController		@@ -54,7 +54,7 @@ class ProfileEditorController < MyProfileController
54	@current_category = Category.find(params[:category_id])	54	@current_category = Category.find(params[:category_id])
55	@categories = @current_category.children	55	@categories = @current_category.children
56	end	56	end
57	- render :template => 'shared/update_categories', :locals => { :category => @current_category }	57	+ render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
58	end	58	end
59		59
60	def header_footer	60	def header_footer
1	<%	1	<%
2	content = render :partial => 'shared/select_categories',	2	content = render :partial => 'shared/select_categories',
3	- :locals => {:object_name => 'article', :multiple => true}, :layout => false	3	+ :locals => {:object_name => object_name, :multiple => true}, :layout => false
4	%>	4	%>
5	jQuery('#select-categories').html('<%= j(content) %>');	5	jQuery('#select-categories').html('<%= j(content) %>');