Download as
Browse Code »

Commit d4f2df646bd0ab1fe7b42780692429c44428e0ca

Authored by João M. M. da Silva + Diego Araújo
Committed by João M. M. da Silva
1 parent d8b981b8
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

[Mezuro] Completed project model, fixtures and tests refactoring.

Showing 3 changed files with 58 additions and 56 deletions   Show diff stats
plugins/mezuro/lib/kalibro/project.rb
  Diff comments   View file @d4f2df6
1 1 class Kalibro::Project < Kalibro::Model
2 2  
3   - attr_accessor :name, :license, :description, :repository, :configuration_name, :state, :kalibro_error
  3 + attr_accessor :id, :name, :description
4 4  
5   - def self.all_names
6   - response = request("Project", :get_project_names)[:project_name]
  5 + def self.all
  6 + response = request("Project", :all_projects)[:project].to_a
7 7 response = [] if response.nil?
8   - response
  8 + response.map {|project| new project}
9 9 end
10 10  
11   - def self.find_by_name(project_name)
12   - new request("Project", :get_project, :project_name => project_name)[:project]
  11 + def self.find(project_id)
  12 + new request("Project", :get_project, :project_id => project_id)[:project]
13 13 end
14 14  
15   - def repository=(value)
16   - @repository = Kalibro::Repository.to_object value
  15 + def self.project_of(repository_id)
  16 + new request("Project", :project_of, :repository_id => repository_id)[:project]
17 17 end
18   -
  18 +=begin
19 19 def error=(value)
20 20 @kalibro_error = Kalibro::Error.to_object value
21 21 end
... ... @@ -47,5 +47,6 @@ class Kalibro::Project &lt; Kalibro::Model
47 47 add_error exception
48 48 end
49 49 end
  50 +=end
50 51  
51 52 end
... ...
plugins/mezuro/test/fixtures/project_fixtures.rb
  Diff comments   View file @d4f2df6
... ... @@ -6,22 +6,15 @@ class ProjectFixtures
6 6 Kalibro::Project.new project_hash
7 7 end
8 8  
  9 + def self.created_project
  10 + Kalibro::Project.new :name => 'Qt-Calculator', :description => 'Calculator for Qt'
  11 + end
  12 +
9 13 def self.project_hash
10 14 {
  15 + :id => 42,
11 16 :name => 'Qt-Calculator',
12   - :license => 'GPL',
13   - :description => 'Calculator for Qt',
14   - :repository => RepositoryFixtures.repository_hash,
15   - :configuration_name => 'Kalibro for Java',
16   - :state => 'READY',
17   - :attributes! =>
18   - {
19   - :repository=>
20   - {
21   - "xsi:type"=>"kalibro:repositoryXml",
22   - "xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance"
23   - }
24   - }
  17 + :description => 'Calculator for Qt'
25 18 }
26 19 end
27 20  
... ...
plugins/mezuro/test/unit/kalibro/project_test.rb
  Diff comments   View file @d4f2df6
... ... @@ -7,64 +7,71 @@ class ProjectTest &lt; ActiveSupport::TestCase
7 7 def setup
8 8 @hash = ProjectFixtures.project_hash
9 9 @project = ProjectFixtures.project
  10 + @created_project = ProjectFixtures.created_project
10 11 @project_content = ProjectFixtures.project_content
11 12 end
  13 +
  14 + should 'initialize new project from hash' do
  15 + project = Kalibro::Project.new @hash
  16 + assert_equal @hash[:name], project.name
  17 + end
12 18  
13   - should 'get all project names' do
14   - response_hash = {:project_name => [@project.name]}
15   - Kalibro::Project.expects(:request).with("Project", :get_project_names).returns(response_hash)
16   - assert_equal response_hash[:project_name], Kalibro::Project.all_names
  19 + should 'convert project to hash' do
  20 + hash = @project.to_hash
  21 + assert_equal @project.name, hash[:name]
17 22 end
18 23  
19   - should 'return empty when there are no projects' do
20   - response_hash = {:project_name => nil}
21   - Kalibro::Project.expects(:request).with("Project", :get_project_names).returns(response_hash)
22   - assert_equal [], Kalibro::Project.all_names
  24 + should 'answer if project exists in kalibro' do
  25 + Kalibro::Project.expects(:request).with("Project", :project_exists, {:project_id => @project.id}).returns({:exists => true})
  26 + assert Kalibro::Project.exists?(@project.id)
23 27 end
24 28  
25   - should 'find project by name' do
26   - request_body = {:project_name => @project.name}
27   - response_hash = {:project => @hash}
28   - Kalibro::Project.expects(:new).with(@hash).returns(@project)
29   - Kalibro::Project.expects(:request).with("Project", :get_project, request_body).returns(response_hash)
30   - assert_equal @project, Kalibro::Project.find_by_name(@project.name)
  29 + should 'find project' do
  30 + Kalibro::Project.expects(:request).with("Project", :get_project, {:project_id => @project.id}).returns(:project => @hash)
  31 + assert_equal @hash[:name], Kalibro::Project.find(@project.id).name
31 32 end
32 33  
33 34 should 'raise error when project doesnt exist' do
34   - request_body = {:project_name => @project.name}
35   - Kalibro::Project.expects(:request).with("Project", :get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))
36   - assert_raise Exception do Kalibro::Project.find_by_name(@project.name) end
  35 + request_body = {:project_id => @project.id}
  36 + Kalibro::Project.expects(:request).with("Project", :get_project, request_body).raises(Exception.new("(S:Server) There is no project with id #{@project.id}"))
  37 + assert_raise Exception do Kalibro::Project.find(@project.id) end
  38 + end
  39 +
  40 + should 'get project of a repository' do
  41 + repository_id = 31
  42 + Kalibro::Project.expects(:request).with("Project", :project_of, {:repository_id => repository_id}).returns({:project => @hash})
  43 + assert_equal @hash[:name], Kalibro::Project.project_of(repository_id).name
  44 + end
  45 +
  46 + should 'get all project' do
  47 + Kalibro::Project.expects(:request).with("Project", :all_projects).returns({:project => [@hash]})
  48 + assert_equal @hash[:name], Kalibro::Project.all.first.name
  49 + end
  50 +
  51 + should 'return empty when there are no projects' do
  52 + Kalibro::Project.expects(:request).with("Project", :all_projects).returns({:project => nil})
  53 + assert_equal [], Kalibro::Project.all
37 54 end
38 55  
39 56 should 'return true when project is saved successfully' do
40   - Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @project.to_hash})
41   - assert @project.save
  57 + id_from_kalibro = 1
  58 + Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @created_project.to_hash}).returns(id_from_kalibro)
  59 + assert @created_project.save
  60 + assert_equal id_from_kalibro, @created_project.id
42 61 end
43 62  
44 63 should 'return false when project is not saved successfully' do
45 64 Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @project.to_hash}).raises(Exception.new)
46 65 assert !(@project.save)
  66 + assert_nil @created_project.id
47 67 end
48 68  
49 69 should 'remove existent project from service' do
50   - Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})
  70 + Kalibro::Project.expects(:request).with("Project", :delete_project, {:project_id => @project.id})
51 71 @project.destroy
52 72 end
53   -
54   - should 'initialize new project from hash' do
55   - project = Kalibro::Project.new @hash
56   - assert_equal @project.name, project.name
57   - assert_equal @project.repository.type, project.repository.type
58   - end
59 73  
60   - should 'convert project to hash' do
61   - hash = @project.to_hash
62   - assert_equal @hash[:name], hash[:name]
63   - assert_equal @hash[:configuration_name], hash[:configuration_name]
64   - assert_equal @hash[:repository], hash[:repository]
65   - assert_equal @hash[:state], hash[:state]
66   - end
67   -
  74 +=begin
68 75 should 'process project without days' do
69 76 Kalibro::Project.expects(:request).with('Kalibro', :process_project, {:project_name => @project.name})
70 77 @project.process_project
... ... @@ -84,5 +91,6 @@ class ProjectTest &lt; ActiveSupport::TestCase
84 91 Kalibro::Project.expects(:request).with("Kalibro", :cancel_periodic_process, {:project_name => @project.name})
85 92 @project.cancel_periodic_process
86 93 end
  94 +=end
87 95  
88 96 end
... ...