From c7d762be129568238f82f14c6673733406545762 Mon Sep 17 00:00:00 2001
From: Greg Von Kuster <greg@bx.psu.edu>
Date: Mon, 16 Jul 2007 17:47:39 +0000
Subject: [PATCH] Next pass of corrections to functional tests.

---
 lib/galaxy/interfaces/root.py | 8 ++++++++
 test/base/twilltestcase.py    | 2 +-
 test/functional/test_basic.py | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/interfaces/root.py b/lib/galaxy/interfaces/root.py
index 37514143cdb..fd31c119033 100644
--- a/lib/galaxy/interfaces/root.py
+++ b/lib/galaxy/interfaces/root.py
@@ -162,6 +162,13 @@ class Universe(common.Root):
             trans.app.datatypes_registry.change_datatype( data, p.datatype )
             trans.app.model.flush()
         elif p.save:
+            
+            data.name  = p.name
+            data.info  = p.info
+            
+            """
+            The following for loop will save all metadata_spec items
+            """
             for name, spec in data.datatype.metadata_spec.items():
                 optional = p.get("is_"+name, None)
                 if optional and optional == 'true':
@@ -190,6 +197,7 @@ class Universe(common.Root):
         for name, spec in data.datatype.metadata_spec.items():
             metadata.append( spec.wrap( data.metadata.get(name),
                                         data ) )
+
         datatypes = [x for x in trans.app.datatypes_registry.datatypes_by_extension.iterkeys()]
         trans.log_event( "Opened edit view on dataset %s" % str(id) )
         return trans.fill_template( "edit_data.tmpl", data=data, metadata=metadata,
diff --git a/test/base/twilltestcase.py b/test/base/twilltestcase.py
index ea0acb0a90e..949dd1da9a6 100644
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -86,7 +86,7 @@ class TwillTestCase(unittest.TestCase):
         if check_patt:
             tc.find(check_patt)
         if kwd:
-            self.submit_form(form=1, button="edit_genome_btn", **kwd)
+            self.submit_form(form=2, button="save", **kwd)
 
     def get_xml_history(self):
         """Returns a parsed xml object corresponding to the history"""
diff --git a/test/functional/test_basic.py b/test/functional/test_basic.py
index 96fb6edd520..abbdac00a8c 100644
--- a/test/functional/test_basic.py
+++ b/test/functional/test_basic.py
@@ -41,8 +41,8 @@ class BasicFunctions(TwillTestCase):
         #
         #self.edit_data(hid=1, dbkey='hg15', chromCol='1', info='foo')
         #self.check_history('hg15 Testdata interval foo')
-        self.edit_data(hid=1, dbkey='hg16', strandCol='')
-        self.check_history('hg16 Testdata interval')
+        self.edit_data(hid=1, dbkey='hg16', is_strandCol='')
+        self.check_history('hg16 Testdata bed')
         
     def test_delete(self):
         """Testing individual deletes"""