motiro 0.6.3

data/test/functional/report_controller_test.rb

@@ -0,0 +1,113 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'report_controller'
+
+require 'mocks/headline'
+require 'stubs/svn_settings'
+
+# Re-raise errors caught by the controller.
+class ReportController; def rescue_action(e) raise e end; end
+
+class ReportControllerTest < Test::Unit::TestCase
+  
+  fixtures :headlines
+  
+  def setup
+    @controller = ReportController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  def test_fetches_headlines_from_cache
+    get :list, { :reporter => 'subversion' }
+    assert_response :success
+    assert_not_nil assigns(:headlines)
+    expected = Headline.find(:all, :conditions => "reported_by = 'subversion'")
+    assert_equal expected.size, assigns(:headlines).size
+  end
+  
+  def test_routes_localized_feeds
+    assert_routing('/feed/subversion/en-gb',
+                   :controller => 'report', :action => 'rss',
+                   :reporter => 'subversion', :locale => 'en-gb' )
+  end
+  
+  def test_fetches_individual_headline_based_on_rid
+    svn_demo_headline = headlines('svn_demo_headline')
+    get :show, { :reporter => svn_demo_headline.reported_by,
+                 :id => svn_demo_headline.rid }
+    assert_response :success
+    assert_not_nil assigns(:headline)
+  end
+  
+  def test_calling_show_with_an_id_delegates_to_chief_editor
+    FlexMock.use do |editor|
+      editor.should_receive(:reporter_with).with('subversion').
+        and_return(SubversionReporter.new)
+      editor.should_receive(:headline_with).with('subversion', '3').
+        returns(headlines('svn_demo_headline')).
+        once
+      
+      @controller = ReportController.new(editor)
+      
+      get :show, {:reporter => 'subversion', :id => 3}
+    end
+  end
+  
+  def test_calling_show_with_invalid_rid_redirects_to_index
+    get :show, { :reporter => 'subversion', :id => 'r300' }
+    assert_equal 'The article r300 from the Subversion reporter could not be found', flash[:notice]
+    assert_redirected_to :controller => 'root', :action => 'index'
+  end
+  
+  def test_include_headline_date_on_guid
+    gita = headlines('gita')
+    
+    get :rss, { :reporter => gita.reported_by }
+    
+    assert_xml_element "//guid[contains(text(), '#{gita.happened_at.strftime('%Y%m%d%H%M%S')}')]"
+  end
+  
+  #TODO what happens if there are no cached headlines?
+  #TODO more headlines registered than the package size
+  
+  def test_shows_breadcrumbs_trail_for_subversion_revision_pages
+    svn_demo = headlines('svn_demo_headline')
+    get :show, :reporter => svn_demo.reported_by, :id => svn_demo.rid
+    
+    assert_xml_element "//div[@id = 'crumbs' and contains(text(), 'You are here')]/a[@href = '/' and text() = 'Home']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/report/older/subversion' and text() = 'Latest news from Subversion']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/report/subversion/#{svn_demo.rid}' and text() = '#{svn_demo.title}']"
+  end
+
+  def test_shows_breadcrumbs_trail_for_older_news_page
+    get :older, :reporter => 'subversion'
+    
+    assert_xml_element "//div[@id = 'crumbs' and contains(text(), 'You are here')]/a[@href = '/' and text() = 'Home']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/report/older/subversion' and text() = 'Latest news from Subversion']"
+  end
+
+private
+
+  def assert_template(expected)
+    assert_equal File.expand_path("#{__FILE__}/../../../app/views/#{expected}.rhtml"),
+                 File.expand_path(@response.rendered_file)
+  end
+  
+end

data/test/functional/report_features_test.rb

@@ -0,0 +1,38 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ReportController; def rescue_action(e) raise e end; end
+
+class ReportFeaturesTest < Test::Unit::TestCase
+  
+  fixtures :pages
+
+  def setup
+    @controller = ReportController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_links_to_feature_pages_from_rss_feed
+    get :rss, :reporter => 'features'
+    assert_xml_element "//link[text() = 'http://test.host/wiki/show/ListLastModifiedFeatures']"
+  end
+  
+end

data/test/functional/report_subversion_test.rb

@@ -0,0 +1,79 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'live_mode_test'
+
+# Re-raise errors caught by the controller.
+class ReportController; def rescue_action(e) raise e end; end
+
+class ReportSubversionTest < Test::Unit::TestCase
+  include LiveModeTestCase
+  
+  def do_setup
+    @controller = ReportController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_report_rss
+    commit_title = 'Created my project'
+    commit_msg = "#{commit_title}\n" +
+                     "\n" +
+                     "This revision creates a brand new directory where we \n" +
+                     "will keep our project files"
+    
+    @repo.mkdir('myproject', commit_msg)
+    
+    get :rss, :reporter => 'subversion'
+    assert_xml_element("//rss/channel/title[text() = 'Motiro - Subversion']")
+    assert_xml_element("//rss/channel/generator[text() = 'Motiro']")
+    assert_xml_element("//rss/channel/item/title[text() = '#{commit_title}']")
+    assert_xml_element("//rss/channel/item/description[contains(text(), 'This revision creates')]")
+    assert_xml_element("//rss/channel/item/*[local-name() = 'creator' and text() = '#{@repo.username}']")
+  end
+  
+  def test_do_not_show_page_text_div_on_feed
+    commit_title = 'Created my project'
+    commit_msg = "#{commit_title}\n" +
+                     "\n" +
+                     "This revision creates a brand new directory where we \n" +
+                     "will keep our project files"
+    
+    @repo.mkdir('myproject', commit_msg)
+    
+    get :rss, :reporter => 'subversion'
+    assert_no_xml_element("//description[contains(text(), 'pagetext')]")
+  end
+
+  def test_translates_rss_feed
+    english_msg = "I changed something in the source code repository"
+    portuguese_msg = "Mudei algo no repositorio de codigo fonte"
+    commit_msg = english_msg + "\n\n--- pt-br ----\n\n" + portuguese_msg
+    
+    @repo.mkdir('myproject', commit_msg)
+    
+    get :rss, :reporter => 'subversion', :locale => 'en'
+    assert_xml_element("//rss/channel/item/title[text() = '#{english_msg}']")
+    assert_no_xml_element("//rss/channel/item/title[text() = '#{portuguese_msg}']")
+
+    get :rss, :reporter => 'subversion', :locale => 'pt-br'
+    assert_xml_element("//rss/channel/item/title[text() = '#{portuguese_msg}']")
+    assert_no_xml_element("//rss/channel/item/title[text() = '#{english_msg}']")
+  end
+  
+end

data/test/functional/root_controller_test.rb

@@ -0,0 +1,127 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'root_controller'
+
+# Re-raise errors caught by the controller.
+class RootController; def rescue_action(e) raise e end; end
+
+class RootControllerTest < Test::Unit::TestCase
+
+  fixtures :users, :pages
+
+  def setup
+    @controller = RootController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  def test_version_number
+    get :index, :locale => 'en'
+    
+    assert_tag :content => /Motiro version 0.6.3/
+  end
+  
+
+  def test_routes_language_specified_on_url
+    assert_routing('/en', :controller => 'root',
+                          :action => 'index',
+                          :locale => 'en')
+  end
+  
+  def test_routes_to_nil_locale_when_language_not_specified
+    assert_routing('/',   :controller => 'root',
+                          :action => 'index',
+                          :locale => nil)
+  end
+  
+  def test_recognizes_locale_for_only_one_language_on_accept_language
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-BR'
+     get :index
+     
+     assert_equal('pt-BR', assigns(:locale))
+     assert_equal('pt-BR', Locale.active.code)
+  end
+  
+  def test_recognizes_locale_for_multiple_language_request
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-br,en-us;q=0.5'
+     get :index
+     
+     assert_equal('pt-br', assigns(:locale))
+     assert_equal('pt-br', Locale.active.code)
+  end
+
+  def test_url_with_locale_takes_precedence
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-BR'
+     get :index, { :locale => 'de' }
+
+     assert_equal('de', assigns(:locale))
+     assert_equal('de', Locale.active.code)
+  end
+  
+  def test_recognizes_locale_when_quality_specified
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-br;q=1,en-us;q=0.5'
+     get :index
+     
+     assert_equal('pt-br', assigns(:locale))
+     assert_equal('pt-br', Locale.active.code)
+  end
+  
+  def test_invalid_language_code_defaults_to_english
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = '7h'
+
+     get :index
+     
+     assert_equal('en-US', assigns(:locale))
+     assert_equal('en-US', Locale.active.code)
+  end
+  
+  def test_uses_last_language_when_language_not_specified
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr'
+     get :index
+
+     assert_equal('fr', Locale.active.code)
+
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = nil
+     get :index, { :locale => 'de' }
+
+     assert_equal('de', Locale.active.code)
+     
+     get :index
+     
+     assert_equal('de', assigns(:locale))
+     assert_equal('de', Locale.active.code)
+  end
+  
+  def test_uses_last_specified_language_when_accept_language_differs
+     get :index, { :locale => 'sw' }
+     
+     assert_equal('sw', Locale.active.code)
+     
+     @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-BR'
+     get :index
+     
+     assert_equal('sw', assigns(:locale))
+     assert_equal('sw', Locale.active.code)
+  end
+  
+  def test_defaults_to_english_when_not_otherwise_specified
+    get :index
+    
+    assert_equal('en-US', assigns(:locale))
+    assert_equal('en-US', Locale.active.code)
+  end
+  
+  def test_empty_language_string_on_accept_language_means_nothing
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = ''
+    get :index
+    
+    assert_equal('en-US', assigns(:locale))
+    assert_equal('en-US', Locale.active.code)
+  end
+  
+  def test_lists_last_changed_feature_pages
+    get :index
+    assert_tag :tag => 'div', :attributes => {:id => 'features'},
+               :content => Regexp.new(pages('list_last_modified_features_page').title)
+  end
+  
+end

data/test/functional/wiki_controller_test.rb

@@ -0,0 +1,280 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'wiki_controller'
+require 'test_configuration'
+
+# Re-raise errors caught by the controller.
+class WikiController; def rescue_action(e) raise e end; end
+
+class WikiControllerTest < Test::Unit::TestCase
+
+  include TestConfiguration
+  
+  fixtures :users, :pages
+
+  def setup
+    @controller = WikiController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_routes_to_nil_locale_when_not_specified_on_url
+    assert_routing('/wiki/edit/MainPage', :controller => 'wiki',
+                                          :action => 'edit',
+                                          :page_name => 'MainPage')
+  end
+
+  def test_routes_to_specified_locale_page
+    assert_routing('/wiki/show/MainPage/en', :controller => 'wiki',
+                                             :action => 'show',
+                                             :page_name => 'MainPage',
+                                             :locale => 'en')
+  end
+  
+  def test_blocks_edition
+    log_as 'bob'
+    
+    page_name = pages('johns_page').name
+    
+    get :edit, { :page_name => page_name }
+    assert_redirected_to :action => 'show', :page_name => page_name
+  end
+  
+  def test_blocks_saving_pages_for_unauthorized_users
+    log_as 'john'
+  
+    page_name = pages('bob_and_erics_page').name
+    
+    post :save, { :page_name => page_name,
+                  :page => { :text => 'New text',
+                             :editors => 'john' },
+                  'btnSave' => true }
+    
+    assert flash[:not_authorized]
+    assert_redirected_to :action => 'show', :page_name => page_name
+  end
+  
+  def test_asks_page_provider_for_pages_when_editing
+    FlexMock.use do |page_provider|
+      page_provider.should_receive(:find_by_name).
+          with('TestPage').
+          once.
+          and_return(Page.new(:name => 'TestPage',
+                                :text => ''))
+      @controller = WikiController.new(page_provider)
+
+      ensure_logged_in
+      get :edit, {:page_name => 'TestPage'}
+      assert_response :success
+    end
+  end
+  
+  def test_authentication_required_for_edition
+     get :edit, { :page_name => 'TestPage' }
+     assert_redirected_to(:controller => 'account', :action => 'login')
+  end
+  
+  def test_only_original_author_can_change_editors_list
+    log_as 'eric'
+    
+    page_name = pages('bob_and_erics_page').name
+    post :save, :page_name => page_name,
+                :page => { :text => 'New page text',
+                           :editors => 'bob eric john'},
+                :btnSave => true
+    
+    log_as 'john'
+    
+    get :edit, :page_name => page_name
+    assert flash[:not_authorized]
+  end
+  
+  def test_noone_can_change_the_original_author
+    bob = users('bob')
+    page_name = pages('johns_page').name
+    
+    log_as 'john'
+    
+    post :save, :page_name => page_name,
+                :btnSave => true, 
+                :page => { :original_author_id => bob.id,
+                           :editors => 'john bob' }
+                
+    log_as 'bob'
+    
+    get :edit, :page_name => page_name
+    assert_no_tag :tag => 'label', :attributes => { :for => 'txtAuthorized' }
+  end
+
+  def test_uses_language_provided_by_address
+    FlexMock.use do |provider|
+        provider.should_receive(:find_by_name).
+          with_any_args.
+          and_return(mocked_page).
+          once
+        
+        @controller = WikiController.new(provider)
+
+        get :show, {:page_name => 'TestPage', :locale => 'en'}
+        assert_tag :content => /You've been mocked!/
+        assert_no_tag :content => /Você foi enganado!/
+     end
+  end
+  
+  def test_renders_page_in_default_language_when_not_specified
+    FlexMock.use do |provider|
+        provider.should_receive(:find_by_name).
+          with_any_args.
+          and_return(mocked_page).
+          once
+
+        @controller = WikiController.new(provider)
+
+        get :show, {:page_name => 'TestPage'}
+        assert_tag :content => /You've been mocked!/
+        assert_no_tag :content => /Você foi enganado!/
+     end
+  end
+  
+  def test_considers_last_chosen_language_when_displaying_not_found_page
+    get '/en'
+    
+    get :show, :page_name => 'NotYetCreatedPage'
+    assert_tag :content => /nothing to be read here/
+  end
+  
+  def test_auto_selects_page_kind
+    log_as 'bob'
+    
+    get :new, :kind => 'feature'
+    assert_tag :tag => 'option', :attributes => { :value => 'feature',
+                                                  :selected => 'selected' }    
+  end
+  
+  def test_inserts_page_name_as_title_on_edition
+    log_as 'bob'
+    
+    get :edit, :page_name => 'BrandNewPage'
+    assert_tag :tag => 'input', :attributes => { :type => 'text',
+                                                 :value => 'Brand new page' }
+  end
+  
+  def test_shows_page_title_as_level_one_header
+    non_matching_title_page = pages('non_matching_title_page')
+    get :show, :page_name => pages('test_page').name
+    assert_tag :tag => 'h1', :content => 'Test page'
+    
+    get :show, :page_name => non_matching_title_page.name
+    assert_tag :tag => 'h1', :content => non_matching_title_page.title
+  end
+  
+  def test_saves_last_editor_and_modification_date
+    log_as 'john'
+    
+    post :save, :btnSave => true, 
+                :page => { :title => 'Page written by John',
+                           :text => 'Anyone can change it',
+                           :kind => 'feature',
+                           :editors => '' }
+    
+    page = Page.find_by_name('PageWrittenByJohn')
+    
+    assert_equal users('john'), page.last_editor
+    assert_in_delta Time.now, page.modified_at, 1.0
+    
+    log_as 'bob'
+    
+    post :save, :page_name => 'PageWrittenByJohn',
+                :btnSave => true, 
+                :page => { :title => 'Page written by John',
+                           :text => 'Bob changed the text',
+                           :kind => 'feature',
+                           :editors => '' }
+    page = Page.find_by_name('PageWrittenByJohn')
+    
+    assert_equal users('bob'), page.last_editor
+  end
+  
+  def test_shows_modification_editor_and_date_on_wiki_pages
+    log_as 'john'
+    
+    post :save, :page_name => 'AnotherBoringWikiPage',
+                :btnSave => true, 
+                :page => { :title => 'Another boring wiki page',
+                           :text => 'Some boring text',
+                           :kind => 'common',
+                           :editors => '' }
+                           
+    expected_time = Time.now.to_s(:rfc822).slice(0, 19) # Wed, 03 Jan 2007 00
+    assert_redirected_to :action => 'show', :page_name => 'AnotherBoringWikiPage'
+    follow_redirect
+    assert_tag :content => /john/
+    assert_tag :content => Regexp.new(expected_time)
+  end
+  
+  def test_displays_date_edition_field_when_editing_events
+    log_as 'bob'
+    
+    get :edit, :page_name => pages('release_event').name
+    
+    assert_xml_element "//select[@id = 'page_happens_at_1i']"
+  end
+  
+  def test_displays_date_when_detailing_events
+    get :show, :page_name => pages('release_event').name
+    
+    assert_tag :content => /This event was planned for  24 January 2007/
+  end
+
+  def test_does_not_try_to_display_date_when_detailing_common_pages
+    get :show, :page_name => pages('test_page').name
+    
+    assert_no_tag :content => /This event was planned for/
+  end
+  
+  def test_shows_breadcrumbs_trail_for_common_wiki_pages
+    test_page = pages('test_page')
+    get :show, :page_name => test_page.name
+    
+    assert_xml_element "//div[@id = 'crumbs' and contains(text(), 'You are here')]/a[@href = '/' and text() = 'Home']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/wiki/show/#{test_page.name}' and text() = '#{test_page.title}']"
+  end
+  
+  def test_shows_breadcrumbs_trail_for_special_wiki_pages
+    release_event = pages('release_event')
+    get :show, :page_name => release_event.name
+    
+    assert_xml_element "//div[@id = 'crumbs' and contains(text(), 'You are here')]/a[@href = '/' and text() = 'Home']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/report/older/events' and text() = 'Events']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/wiki/show/#{release_event.name}' and text() = '#{release_event.title}']"
+  end
+
+private
+
+  def log_as(user_name)
+    @request.session[:user] = users(user_name)
+  end
+  
+  def mocked_page
+    Page.new(:name => 'MockedPage', :title => 'Mocked page',
+             :last_editor => nil, :modified_at => nil, :kind => 'common',
+             :text => "You've been mocked!\n\n--- pt-br ----\n\nVocê foi enganado!")
+  end
+  
+end

data/test/lib/acceptance_test_case.rb

@@ -0,0 +1,43 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+require File.dirname(__FILE__) + "/../../vendor/selenium/selenium"
+
+require 'selenium_extensions'
+
+class AcceptanceTestCase < SeleniumTestCase
+
+  include SeleniumExtensions
+
+  TEST_PASSWORDS = { :bob => 'test', :john => 'lennon', :eric => 'clapton',
+                     :existingbob => 'test', :longbob => 'longtest' }
+  
+  def log_as(user, passwd=nil)
+    open('/en')
+
+    type('user_login', user.to_s)
+    type('user_password', passwd || TEST_PASSWORDS[user])
+    
+    click 'login'
+    wait_for_page_to_load(2000)
+  end
+  
+  def log_out
+    open '/account/logout'  
+  end
+
+end