From 3ce2f4ff14adf32b5d458ffd05e8252ae14a3f10 Mon Sep 17 00:00:00 2001
From: Evandro Jr <evandrojr@gmail.com>
Date: Wed, 26 Nov 2014 13:18:52 -0300
Subject: [PATCH] fix problema creating job

---
 plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb      |  4 ++--
 plugins/virtuoso/test/integration/dspace_test.rb            | 28 ++++++++++++++++++++++++++++
 plugins/virtuoso/test/integration/virtuoso.rb               | 33 +++++++++++++++++++++++++++++++++
 plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb |  4 ++--
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 plugins/virtuoso/test/integration/dspace_test.rb
 create mode 100644 plugins/virtuoso/test/integration/virtuoso.rb

diff --git a/plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb b/plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
index 5697afd..ebc007a 100644
--- a/plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
+++ b/plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
@@ -102,8 +102,8 @@ class VirtuosoPlugin::DspaceHarvest
 
   class Job < Struct.new(:environment_id, :dspace_uri)
     def perform
-      environment = Environment.find(environment_id, dspace_uri)
-      harvest = VirtuosoPlugin::DspaceHarvest.new(environment, {"dspace_uri" => dspace_uri, "last_harvest" => last_harvest})
+      environment = Environment.find(environment_id)
+      harvest = VirtuosoPlugin::DspaceHarvest.new(environment, {"dspace_uri" => dspace_uri})
       harvest.run
     end
   end
diff --git a/plugins/virtuoso/test/integration/dspace_test.rb b/plugins/virtuoso/test/integration/dspace_test.rb
new file mode 100644
index 0000000..1a80022
--- /dev/null
+++ b/plugins/virtuoso/test/integration/dspace_test.rb
@@ -0,0 +1,28 @@
+#require File.dirname(__FILE__) + '/../test_helper.rb'
+#
+#class DspaceTest < ActiveSupport::TestCase
+#
+#  def setup
+#    @environment = Environment.default
+#  end
+#  
+#  attr_reader :environment  
+#
+#  should 'list at least one record' do
+#    settings =
+#    { :virtuoso_uri=>"http://hom.virtuoso.participa.br",
+#      :virtuoso_username=>"dba",
+#      :virtuoso_password=>"dba",
+#      :virtuoso_readonly_username=>"dba",
+#      :virtuoso_readonly_password=>"dba",
+#      :dspace_servers=>[
+#          {"dspace_uri"=>"http://hom.dspace.participa.br"}
+#        ]
+#    }
+#    settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, settings)
+#    harvest = VirtuosoPlugin::DspaceHarvest.new(environment, {"dspace_uri"=>"http://hom.dspace.participa.br"})
+#    params = harvest.last_harvest ? {:from => harvest.last_harvest.utc} : {}
+#    records = harvest.dspace_client.list_records(params)
+#    assert_not_equal records.count, 0
+#  end
+#end
\ No newline at end of file
diff --git a/plugins/virtuoso/test/integration/virtuoso.rb b/plugins/virtuoso/test/integration/virtuoso.rb
new file mode 100644
index 0000000..b748e20
--- /dev/null
+++ b/plugins/virtuoso/test/integration/virtuoso.rb
@@ -0,0 +1,33 @@
+#require File.dirname(__FILE__) + '/../test_helper.rb'
+#
+#class DspaceTest < ActiveSupport::TestCase
+#
+#  def setup
+#    @environment = Environment.default
+#  end
+#  
+#  attr_reader :environment  
+#
+#
+#  should 'update last_harvest after harvert' do
+#    time = Time.now.utc
+#    settings =
+#    { :virtuoso_uri=>"http://hom.virtuoso.participa.br",
+#      :virtuoso_username=>"dba",
+#      :virtuoso_password=>"dba",
+#      :virtuoso_readonly_username=>"dba",
+#      :virtuoso_readonly_password=>"dba",
+#      :dspace_servers=>[
+#          {"dspace_uri"=>"http://hom.dspace.participa.br"}
+#        ]
+#    }
+#    @settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, settings)
+#    harvest = VirtuosoPlugin::DspaceHarvest.new(environment, {"dspace_uri"=>"http://hom.dspace.participa.br" })
+#    harvest.run
+#    assert_not_equal harvest.last_harvest, nil
+#    Noosfero::Plugin::Settings.new(environment.reload, VirtuosoPlugin)
+#    assert_not_equal harvest.last_harvest, nil
+#    assert_not_equal harvest.last_harvest, Time.now.utc
+#  end  
+#  
+#end
\ No newline at end of file
diff --git a/plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb b/plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb
index be33f5d..0941bb4 100644
--- a/plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb
+++ b/plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb
@@ -7,9 +7,9 @@
   <strong>
     <%= labelled_form_field _('Virtuoso URL:'), f.text_field(:virtuoso_uri, :size=> 60) %>
     <%= labelled_form_field _('Virtuoso Admin Username:'), f.text_field(:virtuoso_username, :size=> 60) %>
-    <%= labelled_form_field _('Virtuoso Admin Password:'), f.password_field(:virtuoso_password, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Admin Password:'), f.password_field(:virtuoso_password, :size=> 60, value: @settings.virtuoso_password) %>
     <%= labelled_form_field _('Virtuoso Read-Only Username:'), f.text_field(:virtuoso_readonly_username, :size=> 60) %>
-    <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password, :size=> 60, value: @settings.virtuoso_readonly_password) %>
   </strong>
   <BR>
 <div class="dspace-servers-config-box" >
--
libgit2 0.21.2