[unfinished] fix publish_article features

Rodrigo Souto
1 parent 31c025cc
Showing 4 changed files with 29 additions and 26 deletions Show diff stats
app/views/cms/publish.html.erb
features/publish_article.feature
features/step_definitions/noosfero_steps.rb
features/step_definitions/search_steps.rb
-<script type="text/javascript" charset="utf-8">
-  jQuery(document).ready( function() {
-      jQuery('.publish-article-title').find('label')
-        .click( function(event) {
-            if (this == event.target) {
-                jQuery(this).toggleClass('expanded');
-                jQuery(this).next('input').slideToggle();
-            }
-            return false;
-        }).addClass('collapsed').next('input').hide();
-  });
-
-</script>
 <div class="select-publish-target">
 <h2><%= _('Where do you want to publish this article?') %></h2>
@@ -36,9 +23,7 @@
       <div class='description'><%= _('You can publish this article on your profile where your friends and followers will see.') %></div>
       <%= form_tag do %>
         <%= hidden_field_tag :back_to, @back_to %>
-        <div class='publish-article-title'>
-          <%= labelled_text_field _('Title'), 'name', @article.name %>
-        </div>
+        <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
         <% button_bar do %>
           <%= submit_button 'spread', _('Spread this') %>
@@ -55,10 +40,7 @@
         <%= hidden_field_tag :back_to, @back_to %>
         <% search_action = url_for(:action => 'search_communities_to_publish') %>
         <%= token_input_field_tag(:q, 'search-communities-to-publish', search_action, { :hint_text => _('Type in a search for your community'), :zindex => 10000, :focus => false }) %>
-
-        <div class='publish-article-title'>
-          <%= labelled_text_field _('Title'), 'name', @article.name %>
-        </div>
+        <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
         <% button_bar do %>
           <%= submit_button 'spread', _('Spread this') %>
         <% end %>
@@ -74,9 +56,7 @@
       <%= form_tag :action => 'publish_on_portal_community', :id => @article.id do %>
         <%= hidden_field_tag :back_to, @back_to %>
-        <div class='publish-article-title'>
-          <%= labelled_text_field _('Title'), :name, @article.name %>
-        </div>
+        <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
         <% button_bar do %>
           <%= submit_button 'spread', _('Spread this') %>
@@ -28,16 +28,20 @@ Feature: publish article
     When I go to sample-community's sitemap
     Then I should see "Sample Article"
+  @selenium
   Scenario: publishing an article with a different name
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
     And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
-    And I check "Sample Community"
+    And I choose the following communities to spread
+      | name             |
+      | Sample Community |
     And I fill in "Title" with "Another name"
     And I press "Spread this"
-    When I go to sample-community's sitemap
+    And show sample-community tasks
+    When I go to sample-community's blog
     Then I should see "Another name"
     And I should not see "Sample Article"
@@ -771,4 +771,8 @@ Given /^the field (.*) is public for all users$/ do |field|
     person.fields_privacy[field] = "public"
     person.save!
   end
-end
 \ No newline at end of file
+end
+
+And /^show (.*) tasks$/ do |identifier|
+  puts Community.find_by_identifier(identifier).tasks.pending.count
+end
@@ -3,3 +3,18 @@ When /^I choose the search filter &quot;(.*)&quot;$/ do |filter|
   # find("li", :text => filter).click
   page.execute_script("jQuery('li[title=#{filter}]').click();")
 end
+
+When /^I choose the following communities to spread$/ do |table|
+  ids = []
+  table.hashes.each do |row|
+    name = row.delete("name")
+    community = Community.find_by_name(name)
+    ids << community.id
+  end
+  #TODO make this work somehow...
+  #fill_in('q', :with => ids.join(','))
+  #fill_in('#search-communities-to-publish', :with => ids.join(','))
+  page.execute_script("jQuery('#search-communities-to-publish').val(#{ids.join(',')})")
+  page.execute_script("jQuery('#search-communities-to-publish').show()")
+  p find('#search-communities-to-publish').value
+end
	@@ -771,4 +771,8 @@ Given /^the field (.*) is public for all users$/ do \|field\|		@@ -771,4 +771,8 @@ Given /^the field (.*) is public for all users$/ do \|field\|
771	person.fields_privacy[field] = "public"	771	person.fields_privacy[field] = "public"
772	person.save!	772	person.save!
773	end	773	end
774	-end
775	\ No newline at end of file	774	\ No newline at end of file
		775	+end
		776	+
		777	+And /^show (.*) tasks$/ do \|identifier\|
		778	+ puts Community.find_by_identifier(identifier).tasks.pending.count
		779	+end
	@@ -3,3 +3,18 @@ When /^I choose the search filter "(.*)"$/ do \|filter\|		@@ -3,3 +3,18 @@ When /^I choose the search filter "(.*)"$/ do \|filter\|
3	# find("li", :text => filter).click	3	# find("li", :text => filter).click
4	page.execute_script("jQuery('li[title=#{filter}]').click();")	4	page.execute_script("jQuery('li[title=#{filter}]').click();")
5	end	5	end
		6	+
		7	+When /^I choose the following communities to spread$/ do \|table\|
		8	+ ids = []
		9	+ table.hashes.each do \|row\|
		10	+ name = row.delete("name")
		11	+ community = Community.find_by_name(name)
		12	+ ids << community.id
		13	+ end
		14	+ #TODO make this work somehow...
		15	+ #fill_in('q', :with => ids.join(','))
		16	+ #fill_in('#search-communities-to-publish', :with => ids.join(','))
		17	+ page.execute_script("jQuery('#search-communities-to-publish').val(#{ids.join(',')})")
		18	+ page.execute_script("jQuery('#search-communities-to-publish').show()")
		19	+ p find('#search-communities-to-publish').value
		20	+end