Fix broken test

This commit is contained in:
Aitor Magán 2014-11-07 12:08:57 +01:00
parent c8670f4223
commit 7c2b651da8
1 changed files with 16 additions and 4 deletions

View File

@ -30,6 +30,7 @@ import os
import unittest import unittest
import re import re
import requests import requests
import time
def get_dataset_url(dataset_name): def get_dataset_url(dataset_name):
@ -67,7 +68,7 @@ class TestSelenium(unittest.TestCase):
self.clearBBDD() self.clearBBDD()
self.driver = webdriver.Firefox() self.driver = webdriver.Firefox()
self.driver.implicitly_wait(5) self.driver.implicitly_wait(5000000)
self.driver.set_window_size(1024, 768) self.driver.set_window_size(1024, 768)
self.base_url = 'http://127.0.0.1:5000/' self.base_url = 'http://127.0.0.1:5000/'
@ -177,10 +178,12 @@ class TestSelenium(unittest.TestCase):
driver.find_element_by_id('field-description').send_keys(resource_description) driver.find_element_by_id('field-description').send_keys(resource_description)
driver.find_element_by_id('s2id_autogen1').clear() driver.find_element_by_id('s2id_autogen1').clear()
driver.find_element_by_id('s2id_autogen1').send_keys(resource_format) driver.find_element_by_id('s2id_autogen1').send_keys(resource_format)
driver.find_element_by_xpath('(//button[@name=\'save\'])[4]').click() save_elements = driver.find_elements_by_name('save')
save_elements[len(save_elements) - 1].click()
# THIRD PAGE: Metadata # THIRD PAGE: Metadata
driver.find_element_by_xpath('(//button[@name=\'save\'])[4]').click() save_elements = driver.find_elements_by_name('save')
save_elements[len(save_elements) - 1].click()
def modify_ds(self, url, name, description, tags, private, searchable, allowed_users, acquire_url): def modify_ds(self, url, name, description, tags, private, searchable, allowed_users, acquire_url):
driver = self.driver driver = self.driver
@ -328,6 +331,7 @@ class TestSelenium(unittest.TestCase):
]) ])
def test_invalid_fields(self, allowed_users, acquire_url, expected_msg): def test_invalid_fields(self, allowed_users, acquire_url, expected_msg):
# Create a default user # Create a default user
user = 'user1' user = 'user1'
self.default_register(user) self.default_register(user)
@ -335,6 +339,14 @@ class TestSelenium(unittest.TestCase):
# Create the dataset # Create the dataset
self.login(user, user) self.login(user, user)
pkg_name = 'Dataset 2' pkg_name = 'Dataset 2'
# Go the page to create the dataset
driver = self.driver
driver.get(self.base_url)
driver.find_element_by_link_text('Datasets').click()
driver.find_element_by_link_text('Add Dataset').click()
# Fill the requested information
self.fill_ds_general_info(pkg_name, 'Example description', ['tag1'], True, True, allowed_users, acquire_url) self.fill_ds_general_info(pkg_name, 'Example description', ['tag1'], True, True, allowed_users, acquire_url)
# Check the error message # Check the error message
@ -505,6 +517,6 @@ class TestSelenium(unittest.TestCase):
[], 'http://example.com', 'http://upm.es', 'UPM Main', 'Example Description', 'CSV') [], 'http://example.com', 'http://upm.es', 'UPM Main', 'Example Description', 'CSV')
self.modify_ds(url, pkg_name, description, tags, False, None, None, None) self.modify_ds(url, pkg_name, description, tags, False, None, None, None)
expected_url = '%sdataset/%s' % (self.base_url, url) expected_url = 'dataset/%s' % url
current_url = self.driver.current_url current_url = self.driver.current_url
self.assertIn(expected_url, current_url) # Maybe the current URL include some parameters self.assertIn(expected_url, current_url) # Maybe the current URL include some parameters