Pre-commit clean up

Author: Shtogryn

base/expected_conditions.py

@@ -30,16 +30,20 @@ def __call__(self, driver):
 
 
 class text_to_be_present_in_elements(object):
- """ An expectation for checking if the given text is present in the
+ """An expectation for checking if the given text is present in the
  specified element.
  locator, text
  """
+
  def __init__(self, locator, text_):
  self.locator = locator
  self.text = text_
 
  def __call__(self, driver: WebDriver):
  try:
- return any(self.text in element.text for element in driver.find_elements(*self.locator))
+ return any(
+ self.text in element.text
+ for element in driver.find_elements(*self.locator)
+ )
  except StaleElementReferenceException:
  return False

pages/counter.java

@@ -1,84 +1,84 @@
-import java.util.concurrent.ExecutorService; 
-import java.util.concurrent.Executors; 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
-/** 
-* @author evivehealth on 08/02/19. 
+/**
+* @author evivehealth on 08/02/19.
 */
-// Java program depicting 
-// concurrent programming in action. 
+// Java program depicting
+// concurrent programming in action.
 
-// Runnable Class that defines the logic 
-// of run method of runnable interface 
-public class Counter implements Runnable 
-{ 
-private final MainApp mainApp; 
-private final int loopLimit; 
-private final String task; 
+// Runnable Class that defines the logic
+// of run method of runnable interface
+public class Counter implements Runnable
+{
+private final MainApp mainApp;
+private final int loopLimit;
+private final String task;
 
-// Constructor to get a reference to the main class 
-public Counter 
-(MainApp mainApp, int loopLimit, String task) 
-{ 
-this.mainApp = mainApp; 
-this.loopLimit = loopLimit; 
-this.task = task; 
-} 
+// Constructor to get a reference to the main class
+public Counter
+(MainApp mainApp, int loopLimit, String task)
+{
+this.mainApp = mainApp;
+this.loopLimit = loopLimit;
+this.task = task;
+}
 
-// Prints the thread name, task number and 
-// the value of counter 
-// Calls pause method to allow multithreading to occur 
+// Prints the thread name, task number and
+// the value of counter
+// Calls pause method to allow multithreading to occur
 @Override
-public void run() 
-{ 
-for (int i = 0; i < loopLimit; i++) 
-{ 
-System.out.println("Thread: " + 
+public void run()
+{
+for (int i = 0; i < loopLimit; i++)
+{
+System.out.println("Thread: " +
 Thread.currentThread().getName() + " Counter: "
-+ (i + 1) + " Task: " + task); 
-mainApp.pause(Math.random()); 
-} 
-} 
-} 
-class MainApp 
-{ 
++ (i + 1) + " Task: " + task);
+mainApp.pause(Math.random());
+}
+}
+}
+class MainApp
+{
 
-// Starts the threads. Pool size 2 means at any time 
-// there can only be two simultaneous threads 
-public void startThread() 
-{ 
-ExecutorService taskList = 
-Executors.newFixedThreadPool(2); 
-for (int i = 0; i < 5; i++) 
-{ 
-// Makes tasks available for execution. 
-// At the appropriate time, calls run 
-// method of runnable interface 
-taskList.execute(new Counter(this, i + 1, 
-"task " + (i + 1))); 
-} 
+// Starts the threads. Pool size 2 means at any time
+// there can only be two simultaneous threads
+public void startThread()
+{
+ExecutorService taskList =
+Executors.newFixedThreadPool(2);
+for (int i = 0; i < 5; i++)
+{
+// Makes tasks available for execution.
+// At the appropriate time, calls run
+// method of runnable interface
+taskList.execute(new Counter(this, i + 1,
+"task " + (i + 1)));
+}
 
-// Shuts the thread that's watching to see if 
-// you have added new tasks. 
-taskList.shutdown(); 
-} 
+// Shuts the thread that's watching to see if
+// you have added new tasks.
+taskList.shutdown();
+}
 
-// Pauses execution for a moment 
-// so that system switches back and forth 
-public void pause(double seconds) 
-{ 
+// Pauses execution for a moment
+// so that system switches back and forth
+public void pause(double seconds)
+{
 try
-{ 
-Thread.sleep(Math.round(1000.0 * seconds)); 
-} 
-catch (InterruptedException e) 
-{ 
-e.printStackTrace(); 
-} 
-} 
+{
+Thread.sleep(Math.round(1000.0 * seconds));
+}
+catch (InterruptedException e)
+{
+e.printStackTrace();
+}
+}
 
-// Driver method 
-public static void main(String[] args) 
-{ 
-new MainApp().startThread(); 
-} 
-} 
+// Driver method
+public static void main(String[] args)
+{
+new MainApp().startThread();
+}
+}

pages/institutions.py

@@ -60,9 +60,7 @@ class InstitutionAdminDashboardPage(BaseInstitutionPage):
  url_addition = '/dashboard'
 
  identity = Locator(By.CSS_SELECTOR, 'img[alt="Center For Open Science [Test]"]')
- loading_indicator = Locator(
- By.CSS_SELECTOR, '.ball-scale', settings.LONG_TIMEOUT
- )
+ loading_indicator = Locator(By.CSS_SELECTOR, '.ball-scale', settings.LONG_TIMEOUT)
  title_containers = GroupLocator(
  By.CSS_SELECTOR,
  '._title-container_1d9vmx',
@@ -84,28 +82,40 @@ class InstitutionAdminDashboardPage(BaseInstitutionPage):
  By.CSS_SELECTOR,
  'div._table-wrapper_1w5vdt > div > div.ember-view > div > div > table > tbody > tr',
  )
+
  def get_expanded_total_by_expanded_name(self, department):
- for element in self.department_options:
- name_elem = element.find_element(By.CSS_SELECTOR, "[data-test-expanded-name]")
- if name_elem.text.strip() == department:
- total_elem = element.find_element(By.CSS_SELECTOR, "[data-test-expanded-total]")
+ for element in self.department_options:
+ name_elem = element.find_element(
+ By.CSS_SELECTOR, '[data-test-expanded-name]'
+ )
+ if name_elem.text.strip() == department:
+ total_elem = element.find_element(
+ By.CSS_SELECTOR, '[data-test-expanded-total]'
+ )
  return int(total_elem.text.strip())
 
  def get_kpi_data_by_kpi_title(self, target_title):
  for container in self.kpi_container:
- title_element = container.find_element(By.CSS_SELECTOR, "[data-test-kpi-title]")
+ title_element = container.find_element(
+ By.CSS_SELECTOR, '[data-test-kpi-title]'
+ )
  if title_element.text.strip() == target_title:
- value_element = container.find_element(By.CSS_SELECTOR, "[data-test-kpi-data]")
+ value_element = container.find_element(
+ By.CSS_SELECTOR, '[data-test-kpi-data]'
+ )
  return value_element.text.strip()
 
  def click_on_listbox_trigger(self, section_title):
  for section in self.title_containers:
- title_element = section.find_element(By.CSS_SELECTOR, "[data-test-chart-title]")
+ title_element = section.find_element(
+ By.CSS_SELECTOR, '[data-test-chart-title]'
+ )
  if title_element.text.strip() == section_title:
- button = section.find_element(By.CSS_SELECTOR, "[data-test-expand-additional-data]")
- icon = section.find_element(By.CSS_SELECTOR, "[data-test-toggle-icon]")
+ button = section.find_element(
+ By.CSS_SELECTOR, '[data-test-expand-additional-data]'
+ )
+ icon = section.find_element(By.CSS_SELECTOR, '[data-test-toggle-icon]')
  button.click()
  WebDriverWait(self.driver, 10).until(
- lambda d: icon.get_attribute("data-icon") == "caret-up"
+ lambda d: icon.get_attribute('data-icon') == 'caret-up'
  )
-

pages/preprints.py

@@ -117,7 +117,11 @@ def select_from_dropdown_listbox(self, selection):
  def select_top_level_subject(self, selection):
  subject_selector = 'div[data-analytics-scope="Browse"] > ul > li'
  wait = WebDriverWait(self.driver, 5)
- wait.until(text_to_be_present_in_elements((By.CSS_SELECTOR, subject_selector), selection))
+ wait.until(
+ text_to_be_present_in_elements(
+ (By.CSS_SELECTOR, subject_selector), selection
+ )
+ )
  for subject in self.top_level_subjects:
  if subject.text == selection:
  subject.click()

tests/test_institutions.py

@@ -1,4 +1,5 @@
 import pytest
+
 import markers
 from api import osf_api
 from pages.institutions import (
@@ -58,7 +59,9 @@ def test_institution_admin_dashboard(self, driver, session, must_be_logged_in):
  api_public_project_count = metrics_data['attributes']['public_project_count']
  api_private_project_count = metrics_data['attributes']['private_project_count']
 
- total_project_count = dashboard_page.get_kpi_data_by_kpi_title('OSF Public and Private Projects')
+ total_project_count = dashboard_page.get_kpi_data_by_kpi_title(
+ 'OSF Public and Private Projects'
+ )
 
  # Verify Total User Count
  displayed_user_count = dashboard_page.get_kpi_data_by_kpi_title('Total Users')
@@ -67,14 +70,19 @@ def test_institution_admin_dashboard(self, driver, session, must_be_logged_in):
  dashboard_page.click_on_listbox_trigger('Public vs Private Projects')
 
  # Verify Public Project Count
- displayed_public_project_count = dashboard_page.get_expanded_total_by_expanded_name('Public Projects')
+ displayed_public_project_count = (
+ dashboard_page.get_expanded_total_by_expanded_name('Public Projects')
+ )
  assert int(displayed_public_project_count) == api_public_project_count
 
  # Verify Private Project Count
- displayed_private_project_count = dashboard_page.get_expanded_total_by_expanded_name('Private Projects')
+ displayed_private_project_count = (
+ dashboard_page.get_expanded_total_by_expanded_name('Private Projects')
+ )
  assert int(displayed_private_project_count) == api_private_project_count
 
  # Verify Total Project Count
  assert (
- int(total_project_count) == api_public_project_count + api_private_project_count
+ int(total_project_count)
+ == api_public_project_count + api_private_project_count
  )

tests/test_preprints.py

@@ -283,13 +283,15 @@ def test_edit_preprint(self, session, driver, preprint_detail_page):
  edit_page.basics_tags_input.send_keys(Keys.RETURN)
  # Click Return to preprint button to go back to Preprint Detail page
 
- body = driver.find_element(By.TAG_NAME, "body")
+ body = driver.find_element(By.TAG_NAME, 'body')
  body.send_keys(Keys.HOME)
  WebDriverWait(driver, 5).until(
- EC.invisibility_of_element_located((By.CLASS_NAME, "toast-success"))
+ EC.invisibility_of_element_located((By.CLASS_NAME, 'toast-success'))
  )
  WebDriverWait(driver, 5).until(
- EC.visibility_of_element_located((By.CSS_SELECTOR, '[data-test-next-button]'))
+ EC.visibility_of_element_located(
+ (By.CSS_SELECTOR, '[data-test-next-button]')
+ )
  )
  edit_page.next_button.click()
  WebDriverWait(driver, 5).until(