Merge branch 'master' of gitorious.org:noosfero/noosfero

Caio Almeida
2 parents 0d62704c 2cd9bf00
Showing 40 changed files with 208 additions and 52 deletions Show diff stats
INSTALL
app/helpers/application_helper.rb
app/models/feed_reader_block.rb
app/models/person.rb
app/models/product.rb
app/models/profile.rb
app/views/layouts/application-ng.rhtml
app/views/profile_editor/edit.rhtml
features/browse_catalogs.feature
features/delete_profile.feature
features/edit_article.feature
features/edit_profile.feature
features/manage_product_price_details.feature
features/signup.feature
lib/noosfero/plugin.rb
lib/noosfero/plugin/manager.rb
lib/tasks/doc.rake
plugins/google_analytics/doc/google_analytics.textile
plugins/google_analytics/lib/google_analytics_plugin.rb
plugins/google_analytics/public/images/doc/google-analytics-setup-step1.en.png
@@ -237,6 +237,10 @@ Create the database structure:
 $ RAILS_ENV=production rake db:schema:load
+Compile the translations:
+
+$ RAILS_ENV=production rake noosfero:translations:compile
+
 Now we have to create some initial data. To create your default environment
 (the first one), run the command below:
@@ -258,10 +262,6 @@ $ RAILS_ENV=production ./script/runner &quot;User.create(:login =&gt; &#39;adminuser&#39;, :emai
 (replace "adminuser", "admin@example.com", "admin" with the login, email
 and password of your environment admin)
-Compile the translations:
-
-$ RAILS_ENV=production rake noosfero:translations:compile
-
 To start the Noosfero application servers:
 $ ./script/production start
@@ -1154,7 +1154,7 @@ module ApplicationHelper
   def render_environment_features(folder)
     result = ''
     environment.enabled_features.keys.each do |feature|
-      file = File.join(@controller.view_paths, 'shared', folder.to_s, "#{feature}.rhtml")
+      file = File.join(@controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
       if File.exists?(file)
         result << render(:file => file, :use_full_path => false)
       end
@@ -13,6 +13,7 @@ class FeedReaderBlock &lt; Block
     old_address = address
     orig_set_address(new_address)
     self.enabled = (new_address && new_address != old_address) || (new_address && self.enabled) || false
+    self.fetched_at = nil
   end
   settings_items :limit, :type => :integer
@@ -71,6 +72,7 @@ class FeedReaderBlock &lt; Block
     self.feed_title = nil
     self.error_message = nil
   end
+
   def finish_fetch
     self.fetched_at = Time.now
     self.save!
@@ -403,7 +403,7 @@ class Person &lt; Profile
   end
   def control_panel_settings_button
-    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
+    {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
   def disable
@@ -184,7 +184,7 @@ class Product &lt; ActiveRecord::Base
   end
   def price_described?
-    return false if price.nil?
+    return false if price.blank? or price == 0
     (price - total_production_cost).zero?
   end
@@ -810,7 +810,7 @@ private :generate_url, :url_options
   end
   def control_panel_settings_button
-    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
+    {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
   def self.identification
@@ -63,7 +63,7 @@
                 <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
               </div>
           </span>
-          <form action="/search" class="search_form" method="get" class="clean">
+          <form action="/search" class="search_form clean" method="get" id="top-search">
             <input name="query" size="15" value="<%=_('Search...')%>"
                 onfocus="this.form.className='focused';
                          if(this.value=='<%=_('Search...')%>'){this.value=''}"
@@ -73,8 +73,6 @@
   </table>
   <% end %>
-  <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
-
   <h2><%= _('Translations') %></h2>
   <%= labelled_check_box(
     _('Automatic redirect the visitor to the translated article of him language'),
@@ -87,11 +85,7 @@
     end.join("\n")
   %>
-  <%=
-    @plugins.map(:profile_editor_extras).each do |content|
-      content.respond_to?(:call) ? content.call : content
-    end.join("\n")
-  %>
+  <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
   <% button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
@@ -73,6 +73,19 @@ Feature: browse catalogs
     And I should not see "qualifiers"
     And I should not see "price composition"
+  Scenario: don't display the price when it's not defined
+    Given the following products
+      | owner      | category | name     |
+      | artebonito | categ1   | Produto1 |
+    And I am on /catalog/artebonito
+    Then I should see "Produto1" within "li.product-link"
+    And I should not see "0.00"
+    And I should see "No image" within ".no-image"
+    And I should not see "product unavailable"
+    And I should not see "description"
+    And I should not see "qualifiers"
+    And I should not see "price composition"
+
   Scenario: product name links to product page
     Given the following products
       | owner      | category | name     | price |
@@ -16,7 +16,7 @@ Feature: delete profile
   Scenario: deleting profile
     Given I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
     When I follow "Yes, I am sure"
@@ -32,7 +32,7 @@ Feature: delete profile
   Scenario: giving up of deleting profile
     Given I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
     When I follow "No, I gave up"
@@ -108,7 +108,7 @@ Feature: delete profile
   Scenario: environment admin deletes profile
     Given I am logged in as admin
     And I am on Joao Silva's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
     When I follow "Yes, I am sure"
@@ -91,7 +91,7 @@ Feature: edit article
     Given I am on Joao Silva's sitemap
     When I follow "Save the whales" and wait
     And I follow "Edit" and wait
-    And I follow "Cancel" within ".main-block" and wait
+    And I follow "Cancel" and wait
     Then I should be on /joaosilva/save-the-whales
   @selenium
@@ -11,7 +11,7 @@ Feature: edit profile
       | display_name |
       | birth_date |
     When I go to joao's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I select "November"
     And I select "15"
     And I press "Save"
@@ -23,7 +23,7 @@ Feature: edit profile
       | display_name |
       | birth_date |
     When I go to joao's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I select "November"
     And I select "15"
     And I press "Save"
@@ -35,7 +35,7 @@ Feature: edit profile
       | display_name |
       | birth_date |
     When I go to joao's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I select "November"
     And I select "15"
     And I select "1980"
@@ -48,7 +48,7 @@ Feature: edit profile
       | display_name |
       | birth_date |
     When I go to joao's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I select "November"
     And I select "15"
     And I select "1980"
@@ -80,7 +80,7 @@ Feature: manage product price details
     And I should not see "Taxes" within "#display-price-details"
     And I should see "Energy" within "#display-price-details"
-  Scenario: not display product detail button if product does not have input
+  Scenario: not display price composition if product does not have input
     Given the following product
       | owner      | category | name             |
       | redemoinho | rock     | Yellow Submarine |
@@ -89,13 +89,12 @@ Feature: manage product price details
       | mariasouza | Maria Souza |
     And I am logged in as "mariasouza"
     When I go to Rede Moinho's page of product Yellow Submarine
-    And I follow "Price composition"
-    Then I should not see "Describe here the cost of production"
+    Then I should not see "Price composition"
-  Scenario: not display price details if price is not fully described
+  Scenario: not display price composition if price is not fully described
     Given I am not logged in
     And I go to Rede Moinho's page of product Abbey Road
-    Then I should not see "60.0"
+    Then I should not see "Price composition"
    @selenium
    Scenario: display price details if price is fully described
@@ -53,7 +53,7 @@ Feature: signup
       | joaosilva | Joao Silva |
     Given I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
-    And I follow "Profile Info and settings"
+    And I follow "Edit Profile"
     And I fill in "Name" with ""
     When I press "Save"
     Then I should see "Name can't be blank"
@@ -7,6 +7,10 @@ class Noosfero::Plugin
   class << self
+    def klass(dir)
+      (dir.to_s.camelize + 'Plugin').constantize # load the plugin
+    end
+
     def init_system
       Dir.glob(File.join(Rails.root, 'config', 'plugins', '*')).select do |entry|
         File.directory?(entry)
@@ -18,8 +22,7 @@ class Noosfero::Plugin
           path << File.join(dir, 'lib')
         end
-        plugin_name = File.basename(dir).camelize + 'Plugin'
-        plugin_name.constantize # load the plugin
+        klass(File.basename(dir))
       end
     end
@@ -22,4 +22,11 @@ class Noosfero::Plugin::Manager
     end
   end
+  def [](name)
+    klass = Noosfero::Plugin.klass(name)
+    enabled_plugins.select do |plugin|
+      plugin.kind_of?(klass)
+    end.first
+  end
+
 end
@@ -13,7 +13,7 @@ namespace :noosfero do
         [File.join(RAILS_ROOT, 'doc/noosfero/plugins/index.textile')]
     end
     input = Dir.glob('doc/noosfero/**/*.textile') + plugins_textiles.map{|i| "doc/noosfero/plugins/#{File.basename(i)}"}
-    topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }
+    topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }.uniq
     sections = Dir.glob('doc/noosfero/*').select {|item| File.directory?(item) }
     toc_sections = sections.map {|item| File.join(item, 'toc.en.xhtml')}
     index_sections = sections.map {|item| File.join(item, 'index.en.xhtml')}
@@ -104,11 +104,10 @@ namespace :noosfero do
     desc "Build Noosfero online documentation"
     task :build => [:link_plugins_textiles, po4a_conf] do
       sh "po4a #{po4a_conf}"
-      Rake::Task['noosfero:doc:unlink_plugins_textiles'].invoke
     end
     desc "Cleans Noosfero online documentation"
-    task :clean do
+    task :clean => :unlink_plugins_textiles do
       sh 'rm -f doc/noosfero/*.xhtml'
       sh 'rm -f doc/noosfero/*/*.xhtml'
       rm_f po4a_conf
 h1. Google Analytics
-Tracking and web analytics to people and communities.
+Tracking and web analytics for people and communities.
 h2. Usage
-* Create a "Google Analytics":http://www.google.com/analytics/ account
-* Configure your Google Analytics account following these steps
+Create and configure Google Analytics account following these steps:
+# Open "Google Analytics":http://www.google.com/analytics/
 !=/plugins/google_analytics/images/doc/google-analytics-setup-step1.en.png(Google Setup - Step 1)!
-
+# Sign in to Google Analytics
 !=/plugins/google_analytics/images/doc/google-analytics-setup-step2.en.png(Google Setup - Step 2)!
-
+# Follow signup instructions
 !=/plugins/google_analytics/images/doc/google-analytics-setup-step3.en.png(Google Setup - Step 3)!
-
+# Fill in _Website's URL_ with your profile address (eg.: softwarelivre.org/joenio), _Account Name_ with your name and read and accept terms of use
 !=/plugins/google_analytics/images/doc/google-analytics-setup-step4.en.png(Google Setup - Step 4)!
-
+# Accept default options, save and take note of your _Web Property ID_ (eg.: UA-23455430-3)
 !=/plugins/google_analytics/images/doc/google-analytics-setup-step5.en.png(Google Setup - Step 5)!
-
+# Login to Noosfero, go to your control panel, follow _Profile Info and Settings_ and fill in _Google Analytics Profile ID_ with ID above
 !=/plugins/google_analytics/images/doc/google-analytics-setup-step6.en.png(Google Setup - Step 6)!
-* Take note of your Google Analytics Profile ID
-* Login to Noosfero and go to your control panel
-* Follow Profile Info and Settings and fill in Google Analytics Profile ID
-
 h2. Info
 * "Google Analytics Support":http://support.google.com/analytics
@@ -4,6 +4,8 @@ class GoogleAnalyticsPlugin &lt; Noosfero::Plugin
   include ActionView::Helpers::JavaScriptHelper
   include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
   include ApplicationHelper
   def self.plugin_name
@@ -15,7 +17,7 @@ class GoogleAnalyticsPlugin &lt; Noosfero::Plugin
   end
   def profile_id
-    context.profile && context.profile.data[:google_analytics_profile_id]
+    context.profile && context.profile.google_analytics_profile_id
   end
   def head_ending
@@ -25,7 +27,7 @@ class GoogleAnalyticsPlugin &lt; Noosfero::Plugin
   end
   def profile_editor_extras
-    labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => context.profile.google_analytics_profile_id))
+    expanded_template('profile-editor-extras.rhtml',{:profile_id => profile_id})
   end
 end
@@ -0,0 +1,3 @@
+<h2><%= _('Statistics') %></h2>
+<%= labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => profile_id)) %>
+<%= link_to(_('See how to configure statistics for your profile'), '/doc/plugins/google_analytics', :target => '_blank') %>
@@ -0,0 +1,4 @@
+class GoogleCsePluginEnvironmentController < ApplicationController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  no_design_blocks
+end
@@ -0,0 +1,13 @@
+h1. GoogleCsePlugin
+
+A plugin that uses the Google Custom Search as Noosfero general search engine.
+
+h2. Usage
+
+* Register a Google Custom Search ID at http://www.google.com/cse
+* Set at least basic config, site list and look and fell of your Google Cse ID
+* Configure Noosfero environment with this ID
+** >> env = Environment.find( ... )
+** >> env.settings[:google_cse_id] = '&lt;PUT ID HERE&gt;'
+** >> env.save!
+* That's all! The top search text-field of Noosfero will be used to make searches
@@ -0,0 +1,25 @@
+class GoogleCsePlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "GoogleCsePlugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that uses the Google Custom Search as Noosfero general search engine.")
+  end
+
+  def google_id
+    context.environment.settings[:google_cse_id]
+  end
+
+  def self.results_url_path
+    '/plugin/google_cse/results'
+  end
+
+  def body_beginning
+    unless google_id.blank?
+      expanded_template('search-box.rhtml', {:selector => '#top-search, #footer-search', :plugin => self})
+    end
+  end
+
+end
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_environment_controller'
+
+# Re-raise errors caught by the controller.
+class GoogleCsePluginEnvironmentController; def rescue_action(e) raise e end; end
+
+class GoogleCsePluginEnvironmentControllerTest < Test::Unit::TestCase
+
+  def setup
+    @controller = GoogleCsePluginEnvironmentController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  should 'get results page' do
+    get :results
+    assert_response :success
+  end
+
+end
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class GoogleCsePluginTest < Test::Unit::TestCase
+
+  def setup
+    @plugin = GoogleCsePlugin.new
+    @context = mock()
+    @plugin.context = @context
+    @env = Environment.new
+    @plugin.context.stubs(:environment).returns(@env)
+  end
+
+  should 'get google_id from environment' do
+    @env.stubs(:settings).returns({:google_cse_id => 10})
+    assert_equal 10, @plugin.google_id
+  end
+
+  should 'not use custom search if google_cse_id isnt set' do
+    @env.stubs(:settings).returns({})
+    assert_nil @plugin.body_beginning
+    @env.stubs(:settings).returns({:google_cse_id => 11})
+    assert_not_nil @plugin.body_beginning
+  end
+
+end
@@ -0,0 +1,30 @@
+<% plugin = @plugins[:google_cse] %>
+<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
+<script src="//www.google.com/jsapi" type="text/javascript"></script>
+<script type="text/javascript">
+  function parseQueryFromUrl () {
+    var queryParamName = "q";
+    var search = window.location.search.substr(1);
+    var parts = search.split('&');
+    for (var i = 0; i < parts.length; i++) {
+      var keyvaluepair = parts[i].split('=');
+      if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
+        return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
+      }
+    }
+    return '';
+  }
+  google.load('search', '1', {style : google.loader.themes.MINIMALIST});
+  google.setOnLoadCallback(function() {
+    var customSearchControl = new google.search.CustomSearchControl(
+      '<%= plugin && plugin.google_id %>');
+    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+    var options = new google.search.DrawOptions();
+    options.enableSearchResultsOnly();
+    customSearchControl.draw('cse', options);
+    var queryFromUrl = parseQueryFromUrl();
+    if (queryFromUrl) {
+      customSearchControl.execute(queryFromUrl);
+    }
+  }, true);
+</script>
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+  jQuery(function($) {
+    $('<%= locals[:selector] %>')
+      .attr({class: "cse-search-box", action: "<%= GoogleCsePlugin.results_url_path %>"})
+      .append('<input type="hidden" name="cx" value="<%= locals[:plugin].google_id %>" /><input type="hidden" name="cof" value="FORID:10" /><input type="hidden" name="ie" value="UTF-8" /><input type="hidden" name="siteurl" value="<%= context.environment.default_hostname %>">')
+      .children("input[name='query']")
+        .attr('name', 'q')
+        .attr('id', 'q');
+  });
+</script>
@@ -603,7 +603,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     @controller = ApplicationController.new
     path = File.join(RAILS_ROOT, 'app', 'views')
-    @controller.stubs(:view_paths).returns(path)
+    @controller.stubs(:view_paths).returns([path])
     file = path + '/shared/usermenu/xmpp_chat.rhtml'
     expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')
@@ -127,7 +127,7 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     Time.stubs(:now).returns(now - 3.hours)
     not_expired.finish_fetch
-    # now one block should be expired and the not the other
+    # now one block should be expired and not the other
     Time.stubs(:now).returns(now)
     expired_list = FeedReaderBlock.expired
     assert_includes expired_list, expired
@@ -156,6 +156,17 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert_equal true, reader.enabled
   end
+  should 'be expired when address is updated' do
+    reader = build(:feed_reader_block, :address => 'http://www.example.com/feed')
+    reader.finish_fetch
+    expired_list = FeedReaderBlock.expired
+    assert_not_includes expired_list, reader
+    reader.address = "http://www.example.com/new-feed"
+    reader.save!
+    expired_list = FeedReaderBlock.expired
+    assert_includes expired_list, reader
+  end
+
   should 'be disabled when address is empty' do
     reader = build(:feed_reader_block, :enabled => true, :address => 'http://www.example.com/feed')
     reader.address = nil
@@ -173,7 +184,7 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert_equal true, reader.enabled, 'must enable when setting to new address'
   end
-  should 'kepp enable when address is not changed' do
+  should 'keep enable when address is not changed' do
     reader = build(:feed_reader_block, :address => 'http://www.example.com/feed')
     reader.address = 'http://www.example.com/feed'
     assert_equal true, reader.enabled
	@@ -1154,7 +1154,7 @@ module ApplicationHelper		@@ -1154,7 +1154,7 @@ module ApplicationHelper
1154	def render_environment_features(folder)	1154	def render_environment_features(folder)
1155	result = ''	1155	result = ''
1156	environment.enabled_features.keys.each do \|feature\|	1156	environment.enabled_features.keys.each do \|feature\|
1157	- file = File.join(@controller.view_paths, 'shared', folder.to_s, "#{feature}.rhtml")	1157	+ file = File.join(@controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
1158	if File.exists?(file)	1158	if File.exists?(file)
1159	result << render(:file => file, :use_full_path => false)	1159	result << render(:file => file, :use_full_path => false)
1160	end	1160	end
	@@ -403,7 +403,7 @@ class Person < Profile		@@ -403,7 +403,7 @@ class Person < Profile
403	end	403	end
404		404
405	def control_panel_settings_button	405	def control_panel_settings_button
406	- {:title => _('Profile Info and settings'), :icon => 'edit-profile'}	406	+ {:title => _('Edit Profile'), :icon => 'edit-profile'}
407	end	407	end
408		408
409	def disable	409	def disable
	@@ -184,7 +184,7 @@ class Product < ActiveRecord::Base		@@ -184,7 +184,7 @@ class Product < ActiveRecord::Base
184	end	184	end
185		185
186	def price_described?	186	def price_described?
187	- return false if price.nil?	187	+ return false if price.blank? or price == 0
188	(price - total_production_cost).zero?	188	(price - total_production_cost).zero?
189	end	189	end
190		190
	@@ -810,7 +810,7 @@ private :generate_url, :url_options		@@ -810,7 +810,7 @@ private :generate_url, :url_options
810	end	810	end
811		811
812	def control_panel_settings_button	812	def control_panel_settings_button
813	- {:title => _('Profile Info and settings'), :icon => 'edit-profile'}	813	+ {:title => _('Edit Profile'), :icon => 'edit-profile'}
814	end	814	end
815		815
816	def self.identification	816	def self.identification
	@@ -63,7 +63,7 @@		@@ -63,7 +63,7 @@
63	<%= render :file => 'account/login', :locals => { :is_thickbox => true } %>	63	<%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
64	</div>	64	</div>
65	</span>	65	</span>
66	- <form action="/search" class="search_form" method="get" class="clean">	66	+ <form action="/search" class="search_form clean" method="get" id="top-search">
67	<input name="query" size="15" value="<%=_('Search...')%>"	67	<input name="query" size="15" value="<%=_('Search...')%>"
68	onfocus="this.form.className='focused';	68	onfocus="this.form.className='focused';
69	if(this.value=='<%=_('Search...')%>'){this.value=''}"	69	if(this.value=='<%=_('Search...')%>'){this.value=''}"
	@@ -73,6 +73,19 @@ Feature: browse catalogs		@@ -73,6 +73,19 @@ Feature: browse catalogs
73	And I should not see "qualifiers"	73	And I should not see "qualifiers"
74	And I should not see "price composition"	74	And I should not see "price composition"
75		75
		76	+ Scenario: don't display the price when it's not defined
		77	+ Given the following products
		78	+ \| owner \| category \| name \|
		79	+ \| artebonito \| categ1 \| Produto1 \|
		80	+ And I am on /catalog/artebonito
		81	+ Then I should see "Produto1" within "li.product-link"
		82	+ And I should not see "0.00"
		83	+ And I should see "No image" within ".no-image"
		84	+ And I should not see "product unavailable"
		85	+ And I should not see "description"
		86	+ And I should not see "qualifiers"
		87	+ And I should not see "price composition"
		88	+
76	Scenario: product name links to product page	89	Scenario: product name links to product page
77	Given the following products	90	Given the following products
78	\| owner \| category \| name \| price \|	91	\| owner \| category \| name \| price \|
	@@ -16,7 +16,7 @@ Feature: delete profile		@@ -16,7 +16,7 @@ Feature: delete profile
16	Scenario: deleting profile	16	Scenario: deleting profile
17	Given I am logged in as "joaosilva"	17	Given I am logged in as "joaosilva"
18	And I am on Joao Silva's control panel	18	And I am on Joao Silva's control panel
19	- And I follow "Profile Info and settings"	19	+ And I follow "Edit Profile"
20	And I follow "Delete profile"	20	And I follow "Delete profile"
21	Then I should see "Are you sure you want to delete this profile?"	21	Then I should see "Are you sure you want to delete this profile?"
22	When I follow "Yes, I am sure"	22	When I follow "Yes, I am sure"
	@@ -32,7 +32,7 @@ Feature: delete profile		@@ -32,7 +32,7 @@ Feature: delete profile
32	Scenario: giving up of deleting profile	32	Scenario: giving up of deleting profile
33	Given I am logged in as "joaosilva"	33	Given I am logged in as "joaosilva"
34	And I am on Joao Silva's control panel	34	And I am on Joao Silva's control panel
35	- And I follow "Profile Info and settings"	35	+ And I follow "Edit Profile"
36	And I follow "Delete profile"	36	And I follow "Delete profile"
37	Then I should see "Are you sure you want to delete this profile?"	37	Then I should see "Are you sure you want to delete this profile?"
38	When I follow "No, I gave up"	38	When I follow "No, I gave up"
	@@ -108,7 +108,7 @@ Feature: delete profile		@@ -108,7 +108,7 @@ Feature: delete profile
108	Scenario: environment admin deletes profile	108	Scenario: environment admin deletes profile
109	Given I am logged in as admin	109	Given I am logged in as admin
110	And I am on Joao Silva's control panel	110	And I am on Joao Silva's control panel
111	- And I follow "Profile Info and settings"	111	+ And I follow "Edit Profile"
112	And I follow "Delete profile"	112	And I follow "Delete profile"
113	Then I should see "Are you sure you want to delete this profile?"	113	Then I should see "Are you sure you want to delete this profile?"
114	When I follow "Yes, I am sure"	114	When I follow "Yes, I am sure"
	@@ -91,7 +91,7 @@ Feature: edit article		@@ -91,7 +91,7 @@ Feature: edit article
91	Given I am on Joao Silva's sitemap	91	Given I am on Joao Silva's sitemap
92	When I follow "Save the whales" and wait	92	When I follow "Save the whales" and wait
93	And I follow "Edit" and wait	93	And I follow "Edit" and wait
94	- And I follow "Cancel" within ".main-block" and wait	94	+ And I follow "Cancel" and wait
95	Then I should be on /joaosilva/save-the-whales	95	Then I should be on /joaosilva/save-the-whales
96		96
97	@selenium	97	@selenium
	@@ -11,7 +11,7 @@ Feature: edit profile		@@ -11,7 +11,7 @@ Feature: edit profile
11	\| display_name \|	11	\| display_name \|
12	\| birth_date \|	12	\| birth_date \|
13	When I go to joao's control panel	13	When I go to joao's control panel
14	- And I follow "Profile Info and settings"	14	+ And I follow "Edit Profile"
15	And I select "November"	15	And I select "November"
16	And I select "15"	16	And I select "15"
17	And I press "Save"	17	And I press "Save"
	@@ -23,7 +23,7 @@ Feature: edit profile		@@ -23,7 +23,7 @@ Feature: edit profile
23	\| display_name \|	23	\| display_name \|
24	\| birth_date \|	24	\| birth_date \|
25	When I go to joao's control panel	25	When I go to joao's control panel
26	- And I follow "Profile Info and settings"	26	+ And I follow "Edit Profile"
27	And I select "November"	27	And I select "November"
28	And I select "15"	28	And I select "15"
29	And I press "Save"	29	And I press "Save"
	@@ -35,7 +35,7 @@ Feature: edit profile		@@ -35,7 +35,7 @@ Feature: edit profile
35	\| display_name \|	35	\| display_name \|
36	\| birth_date \|	36	\| birth_date \|
37	When I go to joao's control panel	37	When I go to joao's control panel
38	- And I follow "Profile Info and settings"	38	+ And I follow "Edit Profile"
39	And I select "November"	39	And I select "November"
40	And I select "15"	40	And I select "15"
41	And I select "1980"	41	And I select "1980"
	@@ -48,7 +48,7 @@ Feature: edit profile		@@ -48,7 +48,7 @@ Feature: edit profile
48	\| display_name \|	48	\| display_name \|
49	\| birth_date \|	49	\| birth_date \|
50	When I go to joao's control panel	50	When I go to joao's control panel
51	- And I follow "Profile Info and settings"	51	+ And I follow "Edit Profile"
52	And I select "November"	52	And I select "November"
53	And I select "15"	53	And I select "15"
54	And I select "1980"	54	And I select "1980"
	@@ -53,7 +53,7 @@ Feature: signup		@@ -53,7 +53,7 @@ Feature: signup
53	\| joaosilva \| Joao Silva \|	53	\| joaosilva \| Joao Silva \|
54	Given I am logged in as "joaosilva"	54	Given I am logged in as "joaosilva"
55	And I am on Joao Silva's control panel	55	And I am on Joao Silva's control panel
56	- And I follow "Profile Info and settings"	56	+ And I follow "Edit Profile"
57	And I fill in "Name" with ""	57	And I fill in "Name" with ""
58	When I press "Save"	58	When I press "Save"
59	Then I should see "Name can't be blank"	59	Then I should see "Name can't be blank"