Skip to content

Commit 7a6337a

Browse files
anndaannda
committed
Add test for StyleUtils
1 parent 5ae9e8f commit 7a6337a

File tree

3 files changed

+113
-8
lines changed

3 files changed

+113
-8
lines changed

‎_test/conf/tpl/dokuwiki/style.ini‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
3+
[replacements]
4+
;These overwrites have been generated from the Template styling Admin interface
5+
;Any values in this section will be overwritten by that tool again
6+
__text__ = "#5e4040"
7+
__background__ = "#f2ecec"
8+
__text_alt__ = "#b39292"
9+
__background_alt__ = "#dbcbcb"
10+
__text_neu__ = "#664747"
11+
__background_neu__ = "#b09f9f"
12+
__border__ = "#d8b0b0"
13+
__highlight__ = "#d699ff"
14+
__link__ = "#44703c"
15+
__background_site__ = "#c4d8d6"
16+
__existing__ = "#154b15"
17+
__missing__ = "#c900db"
18+
__site_width__ = "85em"
19+
__sidebar_width__ = "14em"
20+
__tablet_width__ = "820px"
21+
__phone_width__ = "490px"
22+
__theme_color__ = "#004489"

‎_test/conf/tpl/sprintdoc/style.ini‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
3+
[replacements]
4+
;These overwrites have been generated from the Template styling Admin interface
5+
;Any values in this section will be overwritten by that tool again
6+
__text__ = "#252525"
7+
__background__ = "#ffffff"
8+
__text_alt__ = "#454545"
9+
__background_alt__ = "#f6f6f6"
10+
__text_neu__ = "#656565"
11+
__background_neu__ = "#ffffff"
12+
__border__ = "#bbbbbb"
13+
__highlight__ = "#efefef"
14+
__link__ = "#286da8"
15+
__site_width__ = "73%"
16+
__background_site__ = "#715dab"
17+
__text_webframe__ = "#696969"
18+
__nav_menu_color__ = "#696969"
19+
__nav_menu_hover_color__ = "#286da8"
20+
__nav_menu_hover_bg__ = "#FFF"
21+
__background_page_header__ = "#F6F6F6"
22+
__border_light__ = "#DADADA"
23+
__background_page_footer__ = "#252525"
24+
__highlight_text__ = "#252525"
25+
__existing__ = "#286da8"
26+
__missing__ = "#cd5360"
27+
__button_color__ = "#ffffff"
28+
__button_background__ = "#286DA8"
29+
__link_alt__ = "#286DA8"
30+
__default_border_radius__ = "3px"

‎_test/tests/inc/styleutils_cssstyleini.test.php‎

Lines changed: 61 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,69 @@
22

33
class styleutils_cssstyleini_test extends DokuWikiTest {
44

5-
function test_styleini()
6-
{
7-
$tpl = 'dokuwiki';
8-
$util = new \dokuwiki\StyleUtils;
5+
function test_mergedstyleini() {
6+
$util = new \dokuwiki\StyleUtils('dokuwiki', false, true);
97

10-
$old = $util->cssStyleiniOld($tpl);
11-
$new = $util->cssStyleini($tpl);
8+
$expected = array (
9+
'stylesheets' =>
10+
array (
11+
'screen' =>
12+
array (
13+
DOKU_INC . 'lib/tpl/dokuwiki/css/basic.less' => '/./lib/tpl/dokuwiki/',
14+
DOKU_INC . 'lib/tpl/dokuwiki/css/_imgdetail.css' => '/./lib/tpl/dokuwiki/',
15+
DOKU_INC . 'lib/tpl/dokuwiki/css/_media_popup.css' => '/./lib/tpl/dokuwiki/',
16+
DOKU_INC . 'lib/tpl/dokuwiki/css/_media_fullscreen.css' => '/./lib/tpl/dokuwiki/',
17+
DOKU_INC . 'lib/tpl/dokuwiki/css/_fileuploader.css' => '/./lib/tpl/dokuwiki/',
18+
DOKU_INC . 'lib/tpl/dokuwiki/css/_tabs.css' => '/./lib/tpl/dokuwiki/',
19+
DOKU_INC . 'lib/tpl/dokuwiki/css/_links.css' => '/./lib/tpl/dokuwiki/',
20+
DOKU_INC . 'lib/tpl/dokuwiki/css/_toc.css' => '/./lib/tpl/dokuwiki/',
21+
DOKU_INC . 'lib/tpl/dokuwiki/css/_footnotes.css' => '/./lib/tpl/dokuwiki/',
22+
DOKU_INC . 'lib/tpl/dokuwiki/css/_search.less' => '/./lib/tpl/dokuwiki/',
23+
DOKU_INC . 'lib/tpl/dokuwiki/css/_recent.css' => '/./lib/tpl/dokuwiki/',
24+
DOKU_INC . 'lib/tpl/dokuwiki/css/_diff.css' => '/./lib/tpl/dokuwiki/',
25+
DOKU_INC . 'lib/tpl/dokuwiki/css/_edit.css' => '/./lib/tpl/dokuwiki/',
26+
DOKU_INC . 'lib/tpl/dokuwiki/css/_modal.css' => '/./lib/tpl/dokuwiki/',
27+
DOKU_INC . 'lib/tpl/dokuwiki/css/_forms.css' => '/./lib/tpl/dokuwiki/',
28+
DOKU_INC . 'lib/tpl/dokuwiki/css/_admin.less' => '/./lib/tpl/dokuwiki/',
29+
DOKU_INC . 'lib/tpl/dokuwiki/css/structure.less' => '/./lib/tpl/dokuwiki/',
30+
DOKU_INC . 'lib/tpl/dokuwiki/css/design.less' => '/./lib/tpl/dokuwiki/',
31+
DOKU_INC . 'lib/tpl/dokuwiki/css/usertools.less' => '/./lib/tpl/dokuwiki/',
32+
DOKU_INC . 'lib/tpl/dokuwiki/css/pagetools.less' => '/./lib/tpl/dokuwiki/',
33+
DOKU_INC . 'lib/tpl/dokuwiki/css/content.less' => '/./lib/tpl/dokuwiki/',
34+
),
35+
'all' =>
36+
array (
37+
DOKU_INC . 'lib/tpl/dokuwiki/css/mobile.less' => '/./lib/tpl/dokuwiki/',
38+
),
39+
'print' =>
40+
array (
41+
DOKU_INC . 'lib/tpl/dokuwiki/css/print.css' => '/./lib/tpl/dokuwiki/',
42+
),
43+
),
44+
'replacements' =>
45+
array (
46+
'__text__' => '#5e4040',
47+
'__background__' => '#f2ecec',
48+
'__text_alt__' => '#b39292',
49+
'__background_alt__' => '#dbcbcb',
50+
'__text_neu__' => '#664747',
51+
'__background_neu__' => '#b09f9f',
52+
'__border__' => '#d8b0b0',
53+
'__highlight__' => '#d699ff',
54+
'__link__' => '#44703c',
55+
'__background_site__' => '#c4d8d6',
56+
'__existing__' => '#154b15',
57+
'__missing__' => '#c900db',
58+
'__site_width__' => '85em',
59+
'__sidebar_width__' => '14em',
60+
'__tablet_width__' => '820px',
61+
'__phone_width__' => '490px',
62+
'__theme_color__' => '#004489',
63+
),
64+
);
1265

13-
$this->assertEquals($old, $new);
66+
$actual = $util->cssStyleini();
1467

68+
$this->assertEquals($expected, $actual);
1569
}
16-
1770
}

0 commit comments

Comments
 (0)