Changeset 12794 for main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests

Timestamp:

19 Mar 2015, 11:44:54 (10 years ago)

Author:

Henrik Bettermann

Message:

Revert changes from revision 12791.

File:

• main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py (modified) (9 diffs)

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py

@@ -63 +63 @@
         customer.sex = u'f'
         customer.email = u'aa@aa.aa'
-        customer.res_address = u'My address'
         customer.date_of_birth = datetime.date(1981, 2, 4)
         IWorkflowState(customer).setState('started')
@@ -96 +95 @@
         self.assertEqual(result,
             'customer_id,date_of_birth,email,firstname,lastname,middlename,phone,'
-            'reg_number,res_address,sex,suspended,suspended_comment,password,state,history\r\n'
-            'K1000000,1981-02-04#,aa@aa.aa,Beate,Mueller,,,123,My address,f,0,,,started,[]\r\n')
+            'reg_number,sex,suspended,suspended_comment,password,state,history\r\n'
+            'K1000000,1981-02-04#,aa@aa.aa,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
         # We can reimport the file ...
         processor = PCNCustomerProcessor()
@@ -103 +102 @@
             self.outfile,
             ['customer_id','date_of_birth','email','firstname','lastname','middlename','phone',
-            'reg_number','res_address','sex','suspended','suspended_comment','password','state'],
+            'reg_number','sex','suspended','suspended_comment','password','state'],
             mode='create')
         num, num_fail, finished_path, failed_path = result
@@ -112 +111 @@
             self.outfile,
             ['customer_id','date_of_birth','email','firstname','lastname','middlename','phone',
-            'reg_number','res_address','sex','suspended','suspended_comment','password','state'],
+            'reg_number','sex','suspended','suspended_comment','password','state'],
             mode='create')
         num_succ, num_fail, finished_path, failed_path = result
@@ -121 +120 @@
             self.outfile,
             ['customer_id','date_of_birth','xx_email','firstname','lastname','middlename','phone',
-            'xx_reg_number','res_address','sex','suspended','suspended_comment','password','state'],
+            'xx_reg_number','sex','suspended','suspended_comment','password','state'],
             mode='update')
         num_succ, num_fail, finished_path, failed_path = result
@@ -226 +225 @@
             'categories_practice,class_name,comment,contract_category,contract_id,'
             'fee_based,history,last_product_id,lga,product_object,'
-            'product_options,state,state_of_origin,superintendent,'
+            'product_options,res_address,state,state_of_origin,superintendent,'
             'tc_dict,title,user_id,valid_from,valid_to,work_address,work_email,work_phone,'
             'year_qualification\r\n'
             '[],RONContract,,ron,%s,0,'
             '[u\'2015-01-18 16:40:01 WAT - License created by system\'],,,,'
-            '[],created,,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
+            '[],,created,,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
             % self.contract1.contract_id)
         # We can reimport the file if we change the header
@@ -287 +286 @@
             'last_product_id,official_in_state,other_directors,'
             'pharmacists_directors,premises_address,premises_certificate,'
-            'product_object,product_options,recommended,'
+            'product_object,product_options,recommended,res_address,'
             'state,superintendent,tc_dict,title,user_id,valid_from,valid_to,'
             'work_address\r\n'
@@ -293 +292 @@
             '[],ROPContract,rop,%s,,0,'
             '[u\'2015-01-20 18:51:03 WAT - License created by system\']'
-            ',,,,,,,,,,[],,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
+            ',,,,,,,,,,[],,,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
             % self.contract2.contract_id)
         # We can reimport the file if we change the header
@@ -358 +357 @@
         self.browser.getLink("Edit").click()
         self.browser.getControl(name="form.email").value = 'new_email@aa.ng'
-        self.browser.getControl(name="form.res_address").value = 'My address'
         self.browser.getControl("Save", index=0).click()
         self.assertMatches('...Form has been saved...',