From 85c46dbc3a585b2cfef2a45f554544fe127d3815 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Wed, 20 Jan 2010 07:43:30 -0500 Subject: [PATCH] finish filename filters admin and associated selenium test --- comicpress-options.php | 7 ++ options/configoptions.php | 4 +- test/selenium/TestComicFilenameFilters.html | 82 +++++++++++++++++++++ 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/comicpress-options.php b/comicpress-options.php index 3f8247e..8a207ef 100644 --- a/comicpress-options.php +++ b/comicpress-options.php @@ -207,6 +207,13 @@ function comicpress_admin() { ) as $key) { $comicpress_options['comicpress_config'][$key] = wp_filter_nohtml_kses($_REQUEST[$key]); } + + if (isset($_REQUEST['comic_filename_filters'])) { + $comicpress_options['comic_filename_filters'] = comicpress_save_options_comic_filename_filters($_REQUEST['comic_filename_filters']); + } else { + $comicpress_options['comic_filename_filters'] = array(); + } + $tab = 'config'; update_option('comicpress_options',$comicpress_options); } diff --git a/options/configoptions.php b/options/configoptions.php index 4ea27c0..8a1ab90 100644 --- a/options/configoptions.php +++ b/options/configoptions.php @@ -159,7 +159,6 @@ - default_filter; } ?> - @@ -194,7 +192,7 @@ \ \ Remove\ '); diff --git a/test/selenium/TestComicFilenameFilters.html b/test/selenium/TestComicFilenameFilters.html index 9e21a46..74b3686 100644 --- a/test/selenium/TestComicFilenameFilters.html +++ b/test/selenium/TestComicFilenameFilters.html @@ -21,6 +21,43 @@ //div[@id='comicpress-tab-config']/span + + + storeXpathCount + //div[@id="comicpress-comic-filename-filters-holder"]/div + filter_count + + + while + ${filter_count} > 0 + + + + click + //div[@id='comicpress-comic-filename-filters-holder']/div[1]/a + + + + assertConfirmation + Are you sure? + + + + storeXpathCount + //div[@id="comicpress-comic-filename-filters-holder"]/div + filter_count + + + endWhile + + + + + clickAndWait + comicpress_save_config + + + storeXpathCount //div[@id="comicpress-comic-filename-filters-holder"]/div @@ -46,6 +83,26 @@ (${new_filter_count}) == (${filter_count} + 1) true + + clickAndWait + comicpress_save_config + + + + assertTextPresent + ComicPress Settings SAVED! + + + + storeXpathCount + //div[@id="comicpress-comic-filename-filters-holder"]/div + new_filter_count + + + assertEval + (${new_filter_count}) == (${filter_count} + 1) + true + click //div[@id='comicpress-comic-filename-filters-holder']/div[2]/a @@ -66,6 +123,31 @@ (${new_filter_count}) == (${filter_count}) true + + clickAndWait + comicpress_save_config + + + + assertTextPresent + ComicPress Settings SAVED! + + + + storeXpathCount + //div[@id="comicpress-comic-filename-filters-holder"]/div + new_filter_count + + + assertEval + (${new_filter_count}) == (${filter_count}) + true + + + assertTextPresent + ComicPress Settings SAVED! + +