Fixed test: features/send_email_to_environment_members.feature

Also removing the :url param on 2 admin view forms that were breaking the tests. They were originally include to avoid linking to the wrong page on profiles with own domain. But this pages will not be visualized if they are not using the environment domain, therefore there is no need to used this params.

Fixed test: features/send_email_to_environment_members.feature
Also removing the :url param on 2 admin view forms that were breaking the tests. They were originally include to avoid linking to the wrong page on profiles with own domain. But this pages will not be visualized if they are not using the environment domain, therefore there is no need to used this params.
Rodrigo Souto
1 parent 448366be
Showing 3 changed files with 6 additions and 18 deletions Show diff stats
app/views/admin_panel/site_info.rhtml
app/views/users/send_mail.rhtml
features/send_email_to_environment_members.feature
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<% labelled_form_for :environment, @environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
+<% form_for :mailing do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
@@ -15,43 +15,31 @@ Feature: send emails to environment members users
     When I go to /admin/users/send_mail
     Then I should see "Access denied"
-  @selenium-fixme
   Scenario: Send e-mail to members
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     And I fill in "Subject" with "Hello, user!"
     And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /admin/users
-  @selenium-fixme
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /admin/users/send_mail
-  @selenium
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
     Then I should be on /admin/users/send_mail
-  @selenium
   Scenario: Cancel creation of mailing
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     Then I should be on /admin/users/send_mail
     When I follow "Cancel e-mail"
     Then I should be on /admin/users
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4		4
5	<%= render :file => 'shared/tiny_mce' %>	5	<%= render :file => 'shared/tiny_mce' %>
6		6
7	-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do \|f\| %>	7	+<% labelled_form_for :environment, @environment do \|f\| %>
8	<% tabs = [] %>	8	<% tabs = [] %>
9	<% tabs << {:title => _('Site info'), :id => 'site-info',	9	<% tabs << {:title => _('Site info'), :id => 'site-info',
10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>	10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>