Merge branch 'stable'

Conflicts: features/step_definitions/noosfero_steps.rb test/functional/profile_design_controller_test.rb

Merge branch 'stable'
Conflicts: features/step_definitions/noosfero_steps.rb test/functional/profile_design_controller_test.rb
Daniela Feitosa
2 parents 85a2cfa4 fbe9c876
Showing 16 changed files with 149 additions and 36 deletions Show diff stats
app/helpers/application_helper.rb
app/models/domain.rb
app/models/link_list_block.rb
app/views/blocks/profile_image.rhtml
app/views/blocks/profile_info.rhtml
app/views/box_organizer/_article_block.rhtml
app/views/layouts/chat.rhtml
app/views/shared/logged_in/xmpp_chat.rhtml
app/views/shared/not_found.rhtml
features/chat.feature
features/profile_domain.feature
features/step_definitions/noosfero_steps.rb
features/step_definitions/selenium_steps.rb
test/functional/profile_design_controller_test.rb
test/integration/manage_documents_test.rb
test/unit/domain_test.rb
@@ -1119,11 +1119,11 @@ module ApplicationHelper
       pending_tasks_count = link_to(user.all_pending_tasks.count.to_s, '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
  
-    (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -10,7 +10,7 @@ class Domain &lt; ActiveRecord::Base
  
   # <tt>name</tt> must be a sequence of word characters (a to z, plus 0 to 9,
   # plus '_'). Letters must be lowercase
-  validates_format_of :name, :with => /^([a-z0-9_]+\.)+[a-z0-9_]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) and "_"')
+  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9), "_" and "-"')
  
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
@@ -57,7 +57,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(_(link[:name]), expand_address(link[:address]), :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :class => klass)
     )
   end
  
@@ -20,5 +20,5 @@
  
 </div><!-- end class="vcard" -->
 <script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :action => 'profile_info', :block_id => block.id } %>
+  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
 </script>
@@ -41,5 +41,5 @@
  
 </div><!-- end class="vcard" -->
 <script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :action => 'profile_info', :block_id => block.id } %>
+  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
 </script>
@@ -5,6 +5,6 @@
   </p>
 <% else %>
   <% articles = @block.available_articles.select {|article| !article.folder? } %>
-  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]})) %>
+  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
 <% end %>
 </div>
@@ -26,7 +26,7 @@
   </head>
   <body id='chat'>
     <div id='title-bar'>
-      <h1 class='title'><%= _("%s - Friends in chat (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
+      <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
     </div>
     <div id='buddy-list'>
       <div id='environment-logo'>
@@ -6,6 +6,6 @@
     </div>
   </div>
   <a href='#' id='chat-online-users-title' onclick='return false;'>
-    <div class='header'><i class='icon-chat'></i><span><%= _("Online friends <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
+    <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
   </a>
 </div>
@@ -6,6 +6,6 @@
     </p>
     <% button_bar do %>
       <%= button :back, _('Go back'), :back %>
-      <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
+      <%= button :home, _('Go to the home page'), '/' %>
     <% end %>
 </div>
@@ -23,7 +23,7 @@ Feature: chat
   Scenario: provide the chat online users content
     Given feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    Then I should see "Online friends "
+    Then I should see "Friends in chat "
  
   @selenium
   Scenario: provide the chat online users list
@@ -46,7 +46,7 @@ Feature: chat
   @selenium
   Scenario: not provide the chat online users list when environment not support that
     Given I am logged in as "tame"
-    Then I should not see "Online friends "
+    Then I should not see "Friends in chat "
  
   Scenario: block access to chat when environment not support that
     Given I am logged in as "tame"
@@ -64,7 +64,7 @@ Feature: chat
     And I am logged in as "tame"
     When I follow "Open chat"
     And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends in chat (0)"
+    Then I should see "Chat - Colivre.net - Friends online (0)"
  
   @selenium
   Scenario: open chat with an online user in a new window
@@ -75,7 +75,7 @@ Feature: chat
     When I click "#chat-online-users-title"
     And I follow "Maria Silva"
     And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends in chat (0)"
+    Then I should see "Chat - Colivre.net - Friends online (0)"
  
   @selenium
   Scenario: chat starts disconnected by default
@@ -141,4 +141,4 @@ Feature: chat
     When I go to Autoramas's profile
     And I follow "Enter chat room"
     And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends in chat (0)"
+    Then I should see "Chat - Colivre.net - Friends online (0)"
@@ -0,0 +1,66 @@
+Feature: domain for profile
+  As a user
+  I want access a profile by its own domain
+
+  Background:
+    Given the following user
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following communities
+      | identifier       | name             | domain    |
+      | sample-community | Sample Community | localhost |
+    And the following blocks
+      | owner            | type              |
+      | sample-community | ProfileImageBlock |
+      | sample-community | ProfileInfoBlock  |
+    And the environment domain is "127.0.0.1"
+    And "Joao Silva" is admin of "Sample Community"
+
+  @selenium
+  Scenario: access profile control panel through profile blocks
+    Given I am logged in as "joaosilva"
+    When I visit "/" and wait
+    And I follow "Control panel" within "div.profile-info-block" and wait
+    Then I should see "Sample Community" within "span.control-panel-title"
+    When I visit "/" and wait
+    And I follow "Control panel" within "div.profile-image-block" and wait
+    Then I should see "Sample Community" within "span.control-panel-title"
+
+  @selenium
+  Scenario: access user control panel
+    Given I am logged in as "joaosilva"
+    When I visit "/" and wait
+    And I follow "joaosilva" and wait
+    And I follow "Login"
+    And I fill in "joaosilva" for "Username"
+    And I fill in "123456" for "Password"
+    And I press "Log in" and wait
+    And I follow "Control panel" within "div#user" and wait
+    Then I should see "Joao Silva" within "span.control-panel-title"
+
+  @selenium
+  Scenario: access user page
+    Given I am logged in as "joaosilva"
+    When I visit "/" and wait
+    And I follow "joaosilva" and wait
+    Then The page title should contain "Joao Silva"
+
+  @selenium
+  Scenario: access community by domain
+    When I go to the homepage
+    Then The page title should contain "Sample Community"
+
+  @selenium
+  Scenario: Go to profile homepage after clicking on home button on not found page
+    Given I am on the homepage
+    When I go to /something-that-does-not-exist
+    And I follow "Go to the home page"
+    Then the page title should be "Sample Community - Colivre.net"
+
+  @selenium
+  Scenario: Go to environment homepage after clicking on home button on not found page
+    Given I am on the homepage
+    And I click on the logo
+    When I open /something-that-does-not-exist
+    And I follow "Go to the home page"
+    Then the page title should be "Colivre.net"
@@ -20,10 +20,15 @@ Given /^the following (community|communities|enterprises?|organizations?)$/ do |
   klass = kind.singularize.camelize.constantize
   table.hashes.each do |row|
     owner = row.delete("owner")
+    domain = row.delete("domain")
     organization = klass.create!(row)
     if owner
       organization.add_admin(Profile[owner])
     end
+    if domain
+      d = Domain.new :name => domain, :owner => organization
+      d.save(false)
+    end
   end
 end
  
@@ -421,3 +426,8 @@ Given /^that the default environment have (.+) templates?$/ do |option|
       env.inactive_enterprise_template && env.inactive_enterprise_template.destroy
   end
 end
+
+Given /^the environment domain is "([^\"]*)"$/ do |domain|
+  d = Domain.new :name => domain, :owner => Environment.default
+  d.save(false)
+end
@@ -103,6 +103,19 @@ When /^I refresh the page$/ do
   response.selenium.refresh
 end
  
+When /^I click on the logo$/ do
+  selenium.click("css=h1#site-title a")
+  selenium.wait_for_page_to_load(10000)
+end
+
+When /^I open (.*)$/ do |url|
+  selenium.open(URI.join(response.selenium.get_location, url))
+end
+
+Then /^the page title should be "([^"]+)"$/ do |text|
+  selenium.get_text("//title").should == text
+end
+
 #### Noosfero specific steps ####
  
 Then /^the select for category "([^\"]*)" should be visible$/ do |name|
@@ -432,4 +432,11 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'input', :attributes => { :id => 'type_rawhtmlblock', :value => 'RawHTMLBlock' }
   end
  
+  should 'editing article block displays right selected article' do
+    selected_article = fast_create(Article, :profile_id => profile.id)
+    ArticleBlock.any_instance.stubs(:article).returns(selected_article)
+    get :edit, :profile => 'designtestuser', :id => @b1.id
+    assert_tag :tag => 'option', :attributes => {:value => selected_article.id, :selected => 'selected'}
+  end
+
 end
@@ -5,10 +5,10 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
   all_fixtures
  
   def test_creation_of_a_new_article
-    create_user('myuser')
+    user = create_user('myuser')
  
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/{login}'  }
+    assert_tag :tag => 'a', :attributes => { :href => "#{user.environment.top_url}/myprofile\/{login}"  }
  
     get '/myprofile/myuser'
     assert_response :success
@@ -38,7 +38,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
     article.save!
  
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/{login}'  }
+    assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}"  }
  
     get '/myprofile/myuser'
     assert_response :success
@@ -72,7 +72,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
  
     login('myuser', 'myuser')
  
-    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/{login}'  }
+    assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}"  }
     get '/myprofile/myuser'
     assert_response :success
  
@@ -7,23 +7,40 @@ class DomainTest &lt; Test::Unit::TestCase
     Domain.clear_cache
   end
  
-  # Replace this with your real tests.
-  def test_domain_name_format
-    c = Domain.new
-    assert !c.valid?
-    assert c.errors.invalid?(:name)
-
-    c.name = 'bliblibli'
-    assert !c.valid?
-    assert c.errors.invalid?(:name)
-
-    c.name = 'EXAMPLE.NET'
-    assert !c.valid?
-    assert c.errors.invalid?(:name)
-
-    c.name = 'test.net'
-    c.valid?
-    assert !c.errors.invalid?(:name)
+  should 'not allow domains without name' do
+    domain = Domain.new
+    domain.valid?
+    assert domain.errors.invalid?(:name)
+  end
+
+  should 'not allow domain without dot' do
+    domain = Domain.new(:name => 'test')
+    domain.valid?
+    assert domain.errors.invalid?(:name)
+  end
+
+  should 'allow domains with dot' do
+    domain = Domain.new(:name => 'test.org')
+    domain.valid?
+    assert !domain.errors.invalid?(:name)
+  end
+
+  should 'not allow domains with upper cased letters' do
+    domain = Domain.new(:name => 'tEst.org')
+    domain.valid?
+    assert domain.errors.invalid?(:name)
+  end
+
+  should 'allow domains with hyphen' do
+    domain = Domain.new(:name => 'test-domain.org')
+    domain.valid?
+    assert !domain.errors.invalid?(:name)
+  end
+
+  should 'allow domains with underscore' do
+    domain = Domain.new(:name => 'test_domain.org')
+    domain.valid?
+    assert !domain.errors.invalid?(:name)
   end
  
   def test_owner
...	...	@@ -1119,11 +1119,11 @@ module ApplicationHelper
1119	1119	pending_tasks_count = link_to(user.all_pending_tasks.count.to_s, '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1120	1120	end
1121	1121
1122		- (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
	1122	+ (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
1123	1123	render_environment_features(:usermenu) +
1124	1124	link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
1125	1125	manage_enterprises.to_s +
1126		- link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
	1126	+ link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
1127	1127	pending_tasks_count +
1128	1128	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
1129	1129	end
...	...
...	...	@@ -10,7 +10,7 @@ class Domain < ActiveRecord::Base
10	10
11	11	# <tt>name</tt> must be a sequence of word characters (a to z, plus 0 to 9,
12	12	# plus '_'). Letters must be lowercase
13		- validates_format_of :name, :with => /^([a-z0-9_]+\.)+[a-z0-9_]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) and "_"')
	13	+ validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9), "_" and "-"')
14	14
15	15	# checks validations that could not be expressed using Rails' predefined
16	16	# validations. In particular:
...	...
...	...	@@ -57,7 +57,7 @@ class LinkListBlock < Block
57	57	def link_html(link)
58	58	klass = 'icon-' + link[:icon] if link[:icon]
59	59	sanitize_link(
60		- link_to(_(link[:name]), expand_address(link[:address]), :class => klass)
	60	+ link_to(link[:name], expand_address(link[:address]), :class => klass)
61	61	)
62	62	end
63	63
...	...
...	...	@@ -20,5 +20,5 @@
20	20
21	21	</div><!-- end class="vcard" -->
22	22	<script type="text/javascript">
23		- <%= remote_function :url => { :controller => 'profile', :action => 'profile_info', :block_id => block.id } %>
	23	+ <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
24	24	</script>
...	...
...	...	@@ -41,5 +41,5 @@
41	41
42	42	</div><!-- end class="vcard" -->
43	43	<script type="text/javascript">
44		- <%= remote_function :url => { :controller => 'profile', :action => 'profile_info', :block_id => block.id } %>
	44	+ <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
45	45	</script>
...	...
...	...	@@ -5,6 +5,6 @@
5	5	</p>
6	6	<% else %>
7	7	<% articles = @block.available_articles.select {\|article\| !article.folder? } %>
8		- <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {\|item\| [item.path, item.id]})) %>
	8	+ <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {\|item\| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
9	9	<% end %>
10	10	</div>
...	...
...	...	@@ -26,7 +26,7 @@
26	26	</head>
27	27	<body id='chat'>
28	28	<div id='title-bar'>
29		- <h1 class='title'><%= _("%s - Friends in chat (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
	29	+ <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
30	30	</div>
31	31	<div id='buddy-list'>
32	32	<div id='environment-logo'>
...	...
...	...	@@ -6,6 +6,6 @@
6	6	</div>
7	7	</div>
8	8	<a href='#' id='chat-online-users-title' onclick='return false;'>
9		- <div class='header'><i class='icon-chat'></i><span><%= _("Online friends <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
	9	+ <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
10	10	</a>
11	11	</div>
...	...
...	...	@@ -6,6 +6,6 @@
6	6	</p>
7	7	<% button_bar do %>
8	8	<%= button :back, _('Go back'), :back %>
9		- <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
	9	+ <%= button :home, _('Go to the home page'), '/' %>
10	10	<% end %>
11	11	</div>
...	...
...	...	@@ -23,7 +23,7 @@ Feature: chat
23	23	Scenario: provide the chat online users content
24	24	Given feature "xmpp_chat" is enabled on environment
25	25	And I am logged in as "tame"
26		- Then I should see "Online friends "
	26	+ Then I should see "Friends in chat "
27	27
28	28	@selenium
29	29	Scenario: provide the chat online users list
...	...	@@ -46,7 +46,7 @@ Feature: chat
46	46	@selenium
47	47	Scenario: not provide the chat online users list when environment not support that
48	48	Given I am logged in as "tame"
49		- Then I should not see "Online friends "
	49	+ Then I should not see "Friends in chat "
50	50
51	51	Scenario: block access to chat when environment not support that
52	52	Given I am logged in as "tame"
...	...	@@ -64,7 +64,7 @@ Feature: chat
64	64	And I am logged in as "tame"
65	65	When I follow "Open chat"
66	66	And I select window "noosfero_chat"
67		- Then I should see "Chat - Colivre.net - Friends in chat (0)"
	67	+ Then I should see "Chat - Colivre.net - Friends online (0)"
68	68
69	69	@selenium
70	70	Scenario: open chat with an online user in a new window
...	...	@@ -75,7 +75,7 @@ Feature: chat
75	75	When I click "#chat-online-users-title"
76	76	And I follow "Maria Silva"
77	77	And I select window "noosfero_chat"
78		- Then I should see "Chat - Colivre.net - Friends in chat (0)"
	78	+ Then I should see "Chat - Colivre.net - Friends online (0)"
79	79
80	80	@selenium
81	81	Scenario: chat starts disconnected by default
...	...	@@ -141,4 +141,4 @@ Feature: chat
141	141	When I go to Autoramas's profile
142	142	And I follow "Enter chat room"
143	143	And I select window "noosfero_chat"
144		- Then I should see "Chat - Colivre.net - Friends in chat (0)"
	144	+ Then I should see "Chat - Colivre.net - Friends online (0)"
...	...