From 0550b331802c5acfe60f0154cfa1c5ff488bec49 Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Sat, 1 Feb 2014 22:31:38 -0700 Subject: [PATCH] Added tests for sprites and inline images. --- django_pyscss/scss.py | 5 +- setup.py | 1 + testproject/testproject/settings.py | 19 ++++ .../static/images/icons/widget-google-map.png | Bin 0 -> 1811 bytes .../icons/widget-skull-and-crossbones.png | Bin 0 -> 1320 bytes .../testproject/static/images/loading.gif | Bin 0 -> 1737 bytes tests/test_import.py | 66 ----------- tests/test_scss.py | 103 ++++++++++++++++++ 8 files changed, 126 insertions(+), 68 deletions(-) create mode 100644 testproject/testproject/static/images/icons/widget-google-map.png create mode 100644 testproject/testproject/static/images/icons/widget-skull-and-crossbones.png create mode 100644 testproject/testproject/static/images/loading.gif delete mode 100644 tests/test_import.py create mode 100644 tests/test_scss.py diff --git a/django_pyscss/scss.py b/django_pyscss/scss.py index 8b6fb9e..b2cd724 100644 --- a/django_pyscss/scss.py +++ b/django_pyscss/scss.py @@ -9,11 +9,12 @@ from scss import ( Scss, dequote, log, SourceFile, SassRule, config, ) -from django_pyscss.utils import find_one_file +from django_pyscss.utils import find_one_file, find_all_files +# TODO: It's really gross to modify this global settings variable. # This is where PyScss is supposed to find the image files for making sprites. -config.STATIC_ROOT = find_one_file +config.STATIC_ROOT = find_all_files config.STATIC_URL = staticfiles_storage.url('scss/') # This is where PyScss places the sprite files. diff --git a/setup.py b/setup.py index 78f8355..83e5f90 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ install_requires = [ 'PyScss>=1.2.0', ] tests_require = [ + 'Pillow', 'django-compressor>=1.3', ] diff --git a/testproject/testproject/settings.py b/testproject/testproject/settings.py index 919b6e9..9eeb89f 100644 --- a/testproject/testproject/settings.py +++ b/testproject/testproject/settings.py @@ -102,3 +102,22 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ) + +# LOGGING +LOGGING = { + 'version': 1, + 'disable_existing_loggers': True, + 'handlers': { + 'console':{ + 'level': 'DEBUG', + 'class': 'logging.StreamHandler', + }, + }, + 'loggers': { + '': { + 'handlers': ['console'], + 'propagate': True, + 'level': 'INFO', + }, + } +} diff --git a/testproject/testproject/static/images/icons/widget-google-map.png b/testproject/testproject/static/images/icons/widget-google-map.png new file mode 100644 index 0000000000000000000000000000000000000000..e83f0b45c714171ab9d1914dc5ee1c7568b508d8 GIT binary patch literal 1811 zcmbVNc~BEq7>^>1I-nM+RqN;)QQ8Q}<{$}M0+LGtgd>1p6?KzrV1Z;qb|K-YcJRQH zBDA1TYO7X6EtVpV4u_(kqP8AYFdkq<5fBjqQUt2qaM=Fg*qOeW-S@t?-|zR`v)h6L zmpe?IJC#DAILLg(3UZ%eeJ0zH?*+YYU~-#7NFs?)OhXu9148jpV@d>&Y2j!@fxznI zgnGo2Lb1`HVUa|nJOEN*S~_gip_{aN5>26adYkmHDh?q4B@&J51k@K5XQ%+G7EmMH z<)BxWPmINljX+bL2MQTg233KlGY4r z4WtlD$83?3fEq&(dWgX=8jW-#n~oWx8B7lk4=V?YgK?VOX2vU(GUpMRuU|__p;);qCAs zI&xwRQ`Y{;Vc~~6 z9H->^4pR=kw&{;I*Q7UJw{;|!a@Qnb_^Ol%`Hs9@1^o5_$J7h#`Kg+#vJ~!eXt3nk z(EQTo)U+ZtG%W3C%{Zj{0fpLKC6gVZ+QewB{^og$%hy{%4?%r}^Ul#ct3I#pDc@Q2 z$6x6ovA(c^6Lq8xIjEW8vhYFMCVpXX+rTkFyK-nsv0dx_dVSG)kyA#qf8(0C;l@`^ z4CpMkb&dubs7C0(tmA{zKe)Ry zp`$mYduO#D?eTVw-?Oc*BIy)3x7*UaHJ2uIWP5ob8ycPNI&TZ(-KN_(_~h^EkskN> z3_nfF-+l3Ddt3g)mZN#54W*ZZ)t%Fn{ci-qrL*gLADSR)X!oI&0sNQOnlCACHS{&? zs9lQ8`tVLVJ?1q1d4d$$`~B&D$8XXKm+j8X`BEH`=eMn_#TMHWU^DMxU3Ha&Gp+52 ztWxSA+7;i5$MkNNl-%x8C|UxunYj~JF4aAJmC^Zfe(;rht4~JR7X>`dZM!GgbnDY% zb@cja=J}NeV~<;ITz)#xGo_^boM~=P+knd~i(MlvPJLq!Z)jnH8KK!`MxD*}3({O# zyCyB8IM2NLRNZeKMVI*tHxi+#WoJ*j?OfJfZ=u9@i8iQ&(v$tw@>AZ1ms z=C&E;9O>;0pN{b_X5+%DM;zx4Z=`EURvGuktuy?t zEyF$cRWo8EHR+)pM<0DhRACFI4zAeWz-Hm7yoM~~sq5lipy+WtW2Ut4UdPgVGq zD;?$0n`*>0PES*fY4tf9=SJi*u0D2&sIJT#^j?3jE7RibSy|t7&({8n+TPp?%|jF7 v9CjpmuUO)A$@m&7GNSc?-WBD8x8F>(rx*uJ5r4{+Bflw`Bv4!;T$lbgNyyHk literal 0 HcmV?d00001 diff --git a/testproject/testproject/static/images/icons/widget-skull-and-crossbones.png b/testproject/testproject/static/images/icons/widget-skull-and-crossbones.png new file mode 100644 index 0000000000000000000000000000000000000000..3e85c1e8c65a24e75eed331e7fec29e20ff775cf GIT binary patch literal 1320 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