Skip to content

Commit b30e010

Browse files
author
Brandon Istenes
committed
Get tests working
1 parent 74e2c74 commit b30e010

File tree

6 files changed

+34
-16
lines changed

6 files changed

+34
-16
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ libs/
1313
tmp/
1414
fonts/
1515
.webassets-cache/
16+
.webassets-manifest
1617
src/application/static/css/
1718
src/application/static/js/
1819

run_tests.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ TESTARGS=${@:-"src/tests/"}
55
set +e # Don't die before we clean up
66
./link_env_conf.sh test
77
mkdir -p tmp/
8-
../env_gae/bin/nosetests \
8+
./env/bin/python src/assets.py
9+
./env/bin/nosetests \
910
--with-gae \
1011
--verbose \
1112
--gae-application src/ \

setup.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ source env/bin/activate
2727
echo
2828
echo "Creating symlinks"
2929
echo "-----------------"
30-
if [ ! -L src/lib ]; then
30+
if [ ! -L src/libs ]; then
3131
cd src/
32-
ln -s ../env lib
32+
ln -s ../env libs
3333
cd ..
3434
fi
3535

@@ -40,14 +40,14 @@ bower install
4040

4141
if [ ! -f src/application/secret_keys.py ]; then
4242
cd src/
43-
../../env/bin/python ./generate_keys.py
43+
./generate_keys.py
4444
cd ../
4545
fi
4646

4747
echo
4848
echo "Building assets"
4949
echo "---------------"
50-
./env/bin/python ./src/assets.py
50+
./src/assets.py
5151

5252
deactivate
5353

src/application/templates/home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% block content %}
88
<div class="row">
99
<div class="col-xs-12">
10-
<h1>Hey look, a website!</h1>
10+
<h1>Hello World!</h1>
1111
</div>
1212
</div>
1313
{% endblock %}

src/tests/base.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
LOG.setFormatter(logging.Formatter(unicode(logging.BASIC_FORMAT)))
3232
LOG.setLevel(logging.INFO)
3333

34-
JIVE_SERVER_SKIP_SELENIUM_TESTS = os.environ.get('JIVE_SERVER_SKIP_SELENIUM_TESTS')
34+
QUICK = os.environ.get('QUICK') == '1'
3535

36-
QUIET = os.environ.get('JIVE_QUIET') == '1'
36+
QUIET = os.environ.get('QUIET') == '1'
3737

3838

3939
####################################################################################################
@@ -139,11 +139,12 @@ def tearDown(self):
139139
self._tear_down()
140140

141141
def output_debug(self):
142-
print 'CONSOLE'
143-
pprint(self.console())
144-
print 'SOURCE'
145-
print self.driver.page_source
146-
self.save_screenshot()
142+
if not QUIET:
143+
print 'CONSOLE'
144+
pprint(self.console())
145+
print 'SOURCE'
146+
print self.driver.page_source
147+
self.save_screenshot()
147148

148149
def console(self):
149150
return self.driver.get_log('browser')

src/tests/test_pages.py

+18-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,24 @@ def test_thing(self):
2121

2222
class TestInBrowser(base.LiveServerTestBase):
2323

24-
def test_message_sends(self):
24+
def test_hello_in_browser(self):
2525
url = self.url_base()
2626
self.driver.get(url)
2727
self.wait_for_visibility_of_tag('body')
28-
body = self.driver.find_element_by_tag('body')
29-
self.assertIn('Hello', body)
28+
body = self.driver.find_element_by_tag_name('body')
29+
self.assertIn('Hello', body.text)
30+
31+
def test_ajaxy(self):
32+
url = self.url_base() + '/ajaxy?state=b'
33+
self.driver.get(url)
34+
email_input = self.driver.find_element_by_id('email')
35+
email_input.send_keys('[email protected]')
36+
submit_button = self.driver.find_element_by_id('email-form-submit')
37+
submit_button.click()
38+
a_btn = self.driver.find_element_by_id('a-btn')
39+
a_btn.click()
40+
self.wait_for_visibility_of('a')
41+
a_panel = self.driver.find_element_by_id('a')
42+
self.assertIn('[email protected]', a_panel.text)
43+
44+

0 commit comments

Comments
 (0)