Merge pull request #29 from codebendercc/common-test-sketch-fix

Common test sketch fix

Author: dastergon

codebender_testing/utils.py

@@ -370,11 +370,11 @@ def get_elements(self, *locator):
         return self.driver.find_elements(*locator)
 
     def find(self, selector):
-        """Alias for `self.get_element(By.CSS_SELECTOR, selector)`."""
+        """Alias for self.get_element(By.CSS_SELECTOR, selector)."""
         return self.get_element(By.CSS_SELECTOR, selector)
 
     def find_all(self, selector):
-        """Alias for `self.get_elements(By.CSS_SELECTOR, selector)`."""
+        """Alias for self.get_elements(By.CSS_SELECTOR, selector)."""
         return self.get_elements(By.CSS_SELECTOR, selector)
 
     def dropzone_upload(self, selector, fname):
@@ -540,7 +540,7 @@ def open_all_libraries_and_examples(self, url, logfile):
         tic = time.time()
         for url in urls_to_visit:
             self.open(url)
-            self.get_element(By.CSS_SELECTOR, '#mycontainer h1')
+            self.get_element(By.CSS_SELECTOR, '#mycontainer')
             if library_re.match(url):
                 url_name = url.split('/')[-1]
                 name = self.get_element(By.CSS_SELECTOR, '#mycontainer h1 small').text
@@ -861,7 +861,7 @@ def execute_script(self, script, *deps):
 
     def create_sketch(self, privacy, name, description):
         """Creates a sketch with a given name"""
-        createSketchBtn = self.driver.find_element_by_id('create_sketch_btn')
+        createSketchBtn = self.get_element(By.ID, 'create_sketch_btn')
         createSketchBtn.click()
         WebDriverWait(self.driver, VERIFY_TIMEOUT).until(
                 expected_conditions.visibility_of_element_located(
@@ -903,8 +903,7 @@ def change_name(self, name):
         nameField.send_keys(Keys.ENTER)
 
     def change_name_editor(self, name):
-        print "inside change name"
-        sketchHeading = self.driver.find_element_by_id('editor_heading_project_name')
+        sketchHeading = self.get_element(By.ID, 'editor_heading_project_name')
         sketchHeading.click()
         renameInput = '#editor_heading_project_name input'
         headingInput = self.get_element(By.CSS_SELECTOR, renameInput)
@@ -955,7 +954,6 @@ def change_short_description_editor(self, description):
             )
         )
 
-
     def check_iframe(self):
         """Returns the contents of an iframe [project_name, user_name, sketch_contents]"""
         self.driver.switch_to_frame(self.driver.find_element_by_tag_name('iframe'))

tests/common/sketch/test_sketch.py

@@ -32,7 +32,7 @@ def test_rename_project(self):
         self.change_name_editor(TEST_PROJECT_NAME)
 
     def test_change_short_description(self):
-        self.change_short_description_editor('decription')
+        self.change_short_description_editor('description')
 
     def test_verify_code(self):
         """Ensures that we can compile code and see the success message."""
@@ -138,8 +138,7 @@ def test_add_projectfile_direct(self):
         )
         create_field = self.get_element(By.ID, 'createfield')
         create_field.send_keys('test_file.txt')
-        create_button = self.get_element(By.ID, 'createbutton')
-        create_button.click()
+        create_field.send_keys(Keys.ENTER)
         WebDriverWait(self.driver, VERIFY_TIMEOUT).until(
             expected_conditions.invisibility_of_element_located(
                 (By.ID, "creationModal")
@@ -176,4 +175,4 @@ def test_verify_deletion(self):
         )
 
     def test_remove_sketch(self):
-        self.delete_project(TEST_PROJECT_NAME)
+        self.delete_project(TEST_PROJECT_NAME)