From 3c3f6c3cbe15601b0aa1e0ca5571460183d555ce Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Fri, 8 Mar 2013 12:29:44 -0500 Subject: [PATCH 1/2] Revert lettuce css_find function to not fail if it does not find the element. --- .../contentstore/features/advanced-settings.py | 12 ++---------- cms/djangoapps/contentstore/features/common.py | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cms/djangoapps/contentstore/features/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py index ec58aeccc6..b5f704662f 100644 --- a/cms/djangoapps/contentstore/features/advanced-settings.py +++ b/cms/djangoapps/contentstore/features/advanced-settings.py @@ -39,7 +39,7 @@ def reload_the_page(step): def edit_the_name_of_a_policy_key(step): policy_key_css = 'input.policy-key' e = css_find(policy_key_css).first - e.fill('new') + e.type('_new') @step(u'I press the "([^"]*)" notification button$') @@ -121,7 +121,7 @@ def the_policy_key_name_is_unchanged(step): def the_policy_key_name_is_changed(step): policy_key_css = 'input.policy-key' val = css_find(policy_key_css).first.value - assert_equal(val, 'new') + assert_equal(val, 'display_name_new') @step(u'the policy key value is unchanged$') @@ -184,14 +184,6 @@ def assert_entries(css, expected_values): def click_save(): css = "a.save-button" - - # def is_shown(driver): - # visible = css_find(css).first.visible - # if visible: - # # Even when waiting for visible, this fails sporadically. Adding in a small wait. - # time.sleep(float(1)) - # return visible - # wait_for(is_shown) css_click_at(css) diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py index f7e76ecf7f..2ec0427e1d 100644 --- a/cms/djangoapps/contentstore/features/common.py +++ b/cms/djangoapps/contentstore/features/common.py @@ -126,7 +126,7 @@ def css_find(css): def is_visible(driver): return EC.visibility_of_element_located((By.CSS_SELECTOR,css,)) - assert_true(world.browser.is_element_present_by_css(css, 5)) + world.browser.is_element_present_by_css(css, 5) wait_for(is_visible) return world.browser.find_by_css(css) From c5a9ec5e86d145346ae1a5a517752414233dbf40 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Fri, 8 Mar 2013 12:55:01 -0500 Subject: [PATCH 2/2] Speed up the lettuce test for no policy settings. --- .../contentstore/features/advanced-settings.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/contentstore/features/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py index b5f704662f..1024579b45 100644 --- a/cms/djangoapps/contentstore/features/advanced-settings.py +++ b/cms/djangoapps/contentstore/features/advanced-settings.py @@ -97,7 +97,12 @@ def i_see_only_display_name(step): @step('there are no advanced policy settings$') def no_policy_settings(step): - assert_policy_entries([], []) + keys_css = 'input.policy-key' + val_css = 'textarea.json' + k = world.browser.is_element_not_present_by_css(keys_css, 5) + v = world.browser.is_element_not_present_by_css(val_css, 5) + assert_true(k) + assert_true(v) @step('they are alphabetized$') @@ -170,8 +175,8 @@ def delete_entry(index): def assert_policy_entries(expected_keys, expected_values): - assert_entries('.key input', expected_keys) - assert_entries('.json', expected_values) + assert_entries('.key input.policy-key', expected_keys) + assert_entries('textarea.json', expected_values) def assert_entries(css, expected_values):