Download as
Browse Code »

Commit 71a7cfbd7d4a5e34ab19222e7a07380a12a97846

Authored by AntonioTerceiro
1 parent 4fdc5649
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem8: making tests pass (several changes) 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@321 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 8 changed files with 7 additions and 24 deletions   Show diff stats
app/controllers/account_controller.rb
  Diff comments   View file @71a7cfb
@@ -30,7 +30,7 @@ class AccountController < ApplicationController @@ -30,7 +30,7 @@ class AccountController < ApplicationController
30 return unless request.post? 30 return unless request.post?
31 @user.save! 31 @user.save!
32 self.current_user = @user 32 self.current_user = @user
33 - redirect_back_or_default(:controller => '/account', :action => 'index') 33 + redirect_back_or_default(:controller => 'account', :action => 'index')
34 flash[:notice] = _("Thanks for signing up!") 34 flash[:notice] = _("Thanks for signing up!")
35 rescue ActiveRecord::RecordInvalid 35 rescue ActiveRecord::RecordInvalid
36 render :action => 'signup' 36 render :action => 'signup'
app/controllers/application.rb
  Diff comments   View file @71a7cfb
@@ -12,13 +12,6 @@ class ApplicationController < ActionController::Base @@ -12,13 +12,6 @@ class ApplicationController < ActionController::Base
12 before_filter :detect_stuff_by_domain 12 before_filter :detect_stuff_by_domain
13 attr_reader :virtual_community 13 attr_reader :virtual_community
14 14
15 - before_filter :load_owner  
16 - # Load the owner  
17 - def load_owner  
18 - # TODO: this should not be hardcoded  
19 - @owner = Profile.find(1) if Profile.exists?(1)  
20 - end  
21 -  
22 protected 15 protected
23 16
24 # TODO: move this logic somewhere else (Domain class?) 17 # TODO: move this logic somewhere else (Domain class?)
app/models/enterprise.rb
  Diff comments   View file @71a7cfb
1 #An enterprise is a kind of organization. According to the system concept, only enterprises can offer products/services and ahave to be validated by an validation entity 1 #An enterprise is a kind of organization. According to the system concept, only enterprises can offer products/services and ahave to be validated by an validation entity
2 class Enterprise < Organization 2 class Enterprise < Organization
3 - belongs_to :validation_entity, :class_name => 'organization' 3 + belongs_to :validation_entity, :class_name => 'organization', :foreign_key => 'validation_entity_id'
4 end 4 end
test/fixtures/organizations.yml
View file @4fdc564
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
1 -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html  
2 -one:  
3 - id: 1  
4 -two:  
5 - id: 2  
test/functional/application_controller_test.rb
  Diff comments   View file @71a7cfb
@@ -29,11 +29,6 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase @@ -29,11 +29,6 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
29 assert_tag :tag => 'span', :content => 'post_only' 29 assert_tag :tag => 'span', :content => 'post_only'
30 end 30 end
31 31
32 - def test_exist_owner  
33 - get :index  
34 - assert_not_nil assigns(:owner)  
35 - end  
36 -  
37 def test_should_generate_help_box_when_passing_string 32 def test_should_generate_help_box_when_passing_string
38 get :help_with_string 33 get :help_with_string
39 assert_tag({ 34 assert_tag({
test/functional/features_controller_test.rb
  Diff comments   View file @71a7cfb
@@ -6,7 +6,7 @@ class FeaturesController; def rescue_action(e) raise e end; end @@ -6,7 +6,7 @@ class FeaturesController; def rescue_action(e) raise e end; end
6 6
7 class FeaturesControllerTest < Test::Unit::TestCase 7 class FeaturesControllerTest < Test::Unit::TestCase
8 8
9 - fixtures :virtual_communities 9 + fixtures :virtual_communities, :domains
10 10
11 def setup 11 def setup
12 @controller = FeaturesController.new 12 @controller = FeaturesController.new
test/integration/routing_test.rb
  Diff comments   View file @71a7cfb
@@ -25,7 +25,7 @@ class RoutingTest &lt; ActionController::IntegrationTest @@ -25,7 +25,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
25 #FIXME: assert_routing cannot find controllers in plugins' 25 #FIXME: assert_routing cannot find controllers in plugins'
26 flunk 'FIXME: assert_routing cannot find controllers in plugins' 26 flunk 'FIXME: assert_routing cannot find controllers in plugins'
27 require File.join(RAILS_ROOT, 'vendor', 'plugins', 'comatose', 'lib', 'comatose', 'admin_controller') 27 require File.join(RAILS_ROOT, 'vendor', 'plugins', 'comatose', 'lib', 'comatose', 'admin_controller')
28 - assert_routing('/cms/ze', :controller => 'comatose::admin') 28 + assert_routing('/cms/ze', :controller => 'comatose_admin')
29 end 29 end
30 30
31 def test_edit_template 31 def test_edit_template
test/unit/organization_test.rb
  Diff comments   View file @71a7cfb
1 require File.dirname(__FILE__) + '/../test_helper' 1 require File.dirname(__FILE__) + '/../test_helper'
2 2
3 class OrganizationTest < Test::Unit::TestCase 3 class OrganizationTest < Test::Unit::TestCase
4 - fixtures :organizations 4 + fixtures :profiles
5 5
6 - # Replace this with your real tests. 6 + # FIXME: add actual organization tests here
7 def test_truth 7 def test_truth
8 - assert true 8 + assert_not_nil Organization.new
9 end 9 end
10 end 10 end