ctsit · indera · Aug 21, 2015 · Aug 21, 2015 · Aug 21, 2015 · Aug 21, 2015
diff --git a/.gitignore b/.gitignore
@@ -67,6 +67,6 @@ private/
 
 .coveralls.yml
 
-# ignore debugging certs
-ssl/server.crt
-ssl/server.key
+# ignore debugging self-signed certs
+# ssl/server.crt
+# ssl/server.key
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,19 @@ branches:
         - master
         - develop
 
+# env: PATH="/usr/lib/chromium-browser:$PATH"
+
 # __1 Use this to prepare the system to install prerequisites or dependencies
 before_install:
-    - echo "Nothing to do"
+    # http://docs.travis-ci.com/user/gui-and-headless-browsers/
+    - echo "Init xvfb (X Virtual Framebuffer)"
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+    - sleep 3 # give xvfb some time to start
+    # - sudo apt-get install -y chromium-chromedriver
+    # - echo "Current path: $PATH"
+    # - export PATH="/usr/lib/chromium-browser:$PATH"
+    # - ln -sf /usr/bin/chromium-browser /usr/bin/google-chrome
 
 # __2 Use this to install any prerequisites or dependencies necessary to run your build
 install:
@@ -32,6 +42,8 @@ script:
     # put config file in the place expected by config.py
     - cp deploy/sample.settings.conf deploy/settings.conf
     - fab coverage
+    - fab run &
+    - behave
 
 # __5a after_success
 after_success:
@@ -44,3 +56,8 @@ after_failure:
 # __6
 after_script:
     echo "Cleanup."
+
+#addons:
+#    apt:
+#        packages:
+#            - chromium-chromedriver
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -0,0 +1,7 @@
+# Authors
+
+* Andrei Sura             <sura.andrei@gmail.com>
+* Ruchi Vivek Desai       <ruchivdesai@gmail.com>
+* Sanath Pasumarthy       <sanath@ufl.edu>
+* Taeber Rapczak          <taeber@ufl.edu>
+* Nicholas Rejack         <nrejack@ufl.edu>
diff --git a/README.md b/README.md
@@ -1,16 +1,33 @@
 # barebones-flask-app
 
-[![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=master)](https://travis-ci.org/ctsit/barebones-flask-app?branch=master)
-[![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=master&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=master)
+| Branch | [Travis-CI](https://travis-ci.org/ctsit/barebones-flask-app/builds) | [Coveralls](https://coveralls.io/github/ctsit/barebones-flask-app) |
+| :----- | :---------------------------: | :-------: |
+| [Master](https://github.com/ctsit/barebones-flask-app/tree/master) | [![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=master)](https://travis-ci.org/ctsit/barebones-flask-app?branch=master) | [![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=master&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=master) |
+| [Develop](https://github.com/ctsit/barebones-flask-app/tree/develop) | [![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=develop)](https://travis-ci.org/ctsit/barebones-flask-app?branch=develop) | [![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=develop&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=develop) |
 
-[![Build Status](https://travis-ci.org/ctsit/barebones-flask-app.svg?branch=develop)](https://travis-ci.org/ctsit/barebones-flask-app?branch=develop)
-[![Coverage Status](https://coveralls.io/repos/ctsit/barebones-flask-app/badge.svg?branch=develop&service=github)](https://coveralls.io/github/ctsit/barebones-flask-app?branch=develop)
 
+This repo serves as an example of a python web application implemented using the
+Flask micro-framework. It implements role-based authentication and can be used
+for building more complex applications that interact with a database.
 
-This is a basic python web app implemented using the Flask micro-framework
 
 # Contributing
 
+We encourage input and collaboration from the community.
+Please fork the code, implement changes, and submit a
+[pull request](https://github.com/ctsit/barebones-flask-app/pulls).
+
+If you prefer to report a bug or make a suggestion, please create a GitHub
+[issue](https://github.com/ctsit/barebone-flask-app/issues); issues are a great
+place to ask public questions too. Please note that this project is released with
+a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/0/0/).
+By participating in this project you agree to abide by its terms.
+
+
 # Contributors
 
-@see [AUTHORS.md](AUTHORS.md)
+The application was written by Andrei Sura with tremendous support and fedback
+from the entire
+[CTS-IT team](https://www.ctsi.ufl.edu/research/study-development/informatics-consulting/).
+
+For the complete list of contributors please see [AUTHORS.md](AUTHORS.md)
diff --git a/app/static/css/layout.css b/app/static/css/layout.css
@@ -21,8 +21,8 @@
     z-index:80002; /* ensures box appears above overlay */
 }
 
-.red-background {
-    background-color: #a51a11;
+.theme-background {
+    background-color: #123C84;
 }
 
 a.logo-name:hover, a.logo-name:active,
@@ -61,7 +61,6 @@ table.borderless td, table.borderless th {
 .login-form-container {
     margin-top: 3em;
     padding: 3em;
-    background-color: #a51a11;
 }
 
 .footer {

diff --git a/app/static/css/parallax.css b/app/static/css/parallax.css
@@ -13,22 +13,19 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
 
 /* additional sections */
 #home {
-  background: url(/static/img/bottles.jpg) no-repeat center center fixed; 
+  background: url(/static/img/code.jpg) no-repeat center center fixed;
   display: table;
   height: 50vh;
   position: relative;
   width: 100%;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
   background-size: cover;
 }
 
 #about {
 }
 
 #services {
-  background-color: #a51a11;
+  background-color: #123C84;
   color: #ffffff;
 }
 
@@ -45,13 +42,14 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
 }
 
 #information {
-  background: url(/static/img/oil.jpg) no-repeat center center fixed; 
+  background: url(/static/img/code.jpg) no-repeat center center fixed;
   display: table;
   height: 300px;
   position: relative;
   width: 100%;
   background-size: cover;
 }
+
 #information .panel {
   opacity: 0.85;
 }
diff --git a/app/static/img/bottles.jpg b/app/static/img/bottles.jpg
diff --git a/app/static/img/code.jpg b/app/static/img/code.jpg
diff --git a/app/static/img/oil.jpg b/app/static/img/oil.jpg
diff --git a/app/templates/images/bottles.jpg b/app/templates/images/bottles.jpg
diff --git a/app/templates/images/bottles_sm.jpg b/app/templates/images/bottles_sm.jpg
diff --git a/app/templates/images/drop-water.jpg b/app/templates/images/drop-water.jpg
diff --git a/app/templates/images/megaphone-png-megaphone-1979px.png b/app/templates/images/megaphone-png-megaphone-1979px.png
diff --git a/app/templates/images/oil_red.jpg b/app/templates/images/oil_red.jpg
diff --git a/app/templates/images/phone-handle.gif b/app/templates/images/phone-handle.gif
diff --git a/app/templates/images/phone_icon.png b/app/templates/images/phone_icon.png
diff --git a/app/templates/layout.html b/app/templates/layout.html
@@ -51,7 +51,7 @@
 {%endif%}
 
         <!-- Sidebar -->
-        <div id="sidebar-wrapper" class="bg-primary red-background">
+        <div id="sidebar-wrapper" class="bg-primary theme-background">
             <ul class="sidebar-nav">
                 {% for link in user_links %}
                     {{ render_nav_link(link[0], link[1]) }}
@@ -61,7 +61,7 @@
 
         <div id="page-content-wrapper">
             <nav class="navbar">
-                <div class="container-fluid bg-primary red-background">
+                <div class="container-fluid bg-primary theme-background">
                     <div class="navbar-header">
                         <div class="navbar-brand" href="/">
                             {% if current_user.is_authenticated() %}

diff --git a/config.py b/config.py
@@ -26,8 +26,7 @@ class DefaultConfig(object):
     LOG_LEVEL = logging.INFO
 
     # used for deployment
-    CONFIDENTIAL_SETTINGS_FILE = os.path.join(BASEDIR,
-                                              '/srv/apps/barebones/settings.conf')
+    CONFIDENTIAL_SETTINGS_FILE = '/srv/apps/barebones/settings.conf'
 
     # Use local or shib sso auth
     LOGIN_USING_SHIB_AUTH = True
@@ -74,5 +73,5 @@ class TestConfig(DefaultConfig):
     """ Configuration for running tests """
     TESTING = True
     CSRF_ENABLED = False
-    CONFIDENTIAL_SETTINGS_FILE = os.path.join(BASEDIR,
-                                              'deploy/settings.conf')
+    SESSION_COOKIE_SECURE = False
+    CONFIDENTIAL_SETTINGS_FILE = os.path.join(BASEDIR, 'deploy/settings.conf')
diff --git a/features/README.md b/features/README.md
@@ -0,0 +1,8 @@
+# Behave
+
+behave is behaviour-driven development, Python style.
+
+@see
+* http://pythonhosted.org/behave/
+* http://jenisys.github.io/behave.example/
+* http://tott-meetup.readthedocs.org/en/latest/sessions/behave.html
diff --git a/features/environment.py b/features/environment.py
@@ -0,0 +1,19 @@
+from selenium import webdriver
+
+
+def get_browser():
+    # @see http://selenium-python.readthedocs.org/en/latest/api.html
+    return webdriver.Firefox()
+    # desired_capabilities = {'ignore-certificate-errors': True}
+    # return webdriver.PhantomJS(desired_capabilities=desired_capabilities)
+    # return webdriver.Chrome(desired_capabilities=desired_capabilities)
+
+
+def before_all(context):
+    context.browser = get_browser()
+    context.browser.set_window_size(1024, 768)
+    context.browser.implicitly_wait(3)
+
+
+def after_all(context):
+    context.browser.quit()
diff --git a/features/index.feature b/features/index.feature
@@ -0,0 +1,5 @@
+Feature: testing the index page
+
+Scenario: visit index and check the page title
+When we visit index
+Then it should have a title "Barebones Web Application"
diff --git a/features/steps/index.py b/features/steps/index.py
@@ -0,0 +1,11 @@
+from nose.tools import assert_equals
+import time
+
+@when('we visit index')
+def step(context):
+    context.browser.get('https://127.0.0.1:5000/')
+    time.sleep(3)
+
+@then('it should have a title "Barebones Web Application"')
+def step(context):
+    assert_equals(context.browser.title, "Barebones Web Application")
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -4,3 +4,5 @@ pytest==2.7.0
 pytest-cov==1.8.1
 Flask-Testing==0.4.2
 nose==1.3.6
+behave==1.2.5
+selenium==2.47.1
diff --git a/ssl/server.crt b/ssl/server.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBjCCAu4CCQDQcRr8NX8uYzANBgkqhkiG9w0BAQ0FADBFMQswCQYDVQQGEwJB
+VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMB4XDTE1MDgyMDIxMDkzMFoXDTE2MDgxOTIxMDkzMFowRTELMAkG
+A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ALKwDCuK1F50m2lSWB7CzaaseXcIrpHgJsSwGkmrKtpTRob/lECOT+v1nnyr5qbH
+csEGkwFQRZLOUkji6zEUYsxtNYTllp7fWC+FuBDiTgtWTcQpLyQy7s/tG2I2QmF7
+TtUptKTn/Gvn2m6y8SHV4UwDsc/YD6jTBv+VxaIn/Vi/z8uPr4TK3+9CKJI2L+Kw
+z2gfXmPCoe/Snqq9gCw7P6U2d7KrnmjOByAi/E1mjUlgF9Kert6mXcaPHQg7Fms0
+HwVkBVztdRRkxbS1wGerw3/7UWgCAkKb8O997ECG4mRSZsGGijT1DiuA5/oDtY7q
+ZTgQIVlkjmlbPFcf2zzwpbnv+UQLWMJQD4pX6nsZ1A92tWTs05Acm1v8DUzpXa+x
+no/JSUwsklOx0wxZIJzF6VQTIiUgm5F60CrGPUDhthuy8M+7+6wg4EdaYbjEKVpE
+4WUaggAcYAI65FrNKoGhGxyxfhRc57JGI/uLyMLJSHAUntqUAUSZjLqW2TRN6bBl
+qRv3oBDZsu2q9b5HNNUzEzW8/PTyINABUEyFlZMbwaa6nB1HXJEYlmyK4rOl5kQS
+kZHGkyc4BmgIN0VDLeA1g2qz7FybfsT9ZF8fcg39eNVimRE/5ZgS5gHm68glPaGK
+Onw74zyXQd8NKo1XHxM2PiOHD9aVFRbQKM1ODsLOKOOlAgMBAAEwDQYJKoZIhvcN
+AQENBQADggIBAJd43NE62CFIZ0eob1jarxXB8t0iNA5nRsp03uK4ku+jyp9kZTie
+UJyFLorelTuBoDI/9X6IVTH8xcnaFhpm1sLN6E8PeD8cjKG/N8U3jGr5fkS2UOyO
+qxjaRqemRCePQwy6bKKLZbbM0U1tI0dV1024ZSdcEkaOwTy7NZIElJ5mRFU8FKes
+k6mc09aW0pS2/5L5O+bpUTJXuca7odYdooDFtJ05uCdpvMOV3JpeABhJ2Qk2wcly
+ehPcKTvppS7pc/ZdAN4fTYz6BiaqplxIL576kGsDb4sqOuM6p4BuyyZtkUXE7Z0o
+5E/poWlxm8wTaqAca90L2r1NxSGj47660oYsRVQoDlSKIDYSkIB6JmME8wdMu+y3
+ZGddqikdo6SMrpDVSr/xvDd1Yppp0ozKINsVgmFGCWI6bos0/dAcjTjX8rA/+At2
+gFR03zKSRwWY6LMMuz1f6GNDas2sanAWeQOJ+HDOVwbMo1L+PSJyG5BRTeMFQ54x
+kp4rRr4VH0dJtgKDz4V2agcIZZobCaGOgRmxTkMYTM0JH4Oiw5NqlprpjTuOwPU8
+cwfVKFtDMC81a+C/3vDKfuzcGXaHeXyEV+FcQfjiNg69YhCM2yMiwEnFqJG78YXV
+gLT4UGDgrOX6KMcgrt7Krgf3QVb5V4dgneCGZFBAE2dyZ9XacVM9B7RO
+-----END CERTIFICATE-----
diff --git a/ssl/server.key b/ssl/server.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----