Update testing on the boilerplate

NdagiStanley · May 11, 2018 · 821893a · 821893a
1 parent 453352d
commit 821893a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -19,11 +19,13 @@ If you are using `vue-cli@1.x`, it will be pulling the `master` branch of this t
 Common topics are discussed in the [docs](http://vuejs-templates.github.io/webpack). Make sure to read it!
 
 # Vue Django
-[![Code Climate](https://codeclimate.com/github/NdagiStanley/vue-django/badges/gpa.svg)](https://codeclimate.com/github/NdagiStanley/vue-django)
-<a href="https://codeclimate.com/github/NdagiStanley/vue-django"><img src="https://codeclimate.com/github/NdagiStanley/vue-django/badges/issue_count.svg" /></a>
+[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://github.com/ellerbrock/open-source-badge/)
+[![Open Source Love](https://badges.frapsoft.com/os/mit/mit.svg?v=102)](https://github.com/ellerbrock/open-source-badge/)
+[![Help Contribute to Open Source](https://www.codetriage.com/ndagistanley/vue-django/badges/users.svg)](https://www.codetriage.com/ndagistanley/vue-django)
+
+[![Build Status](https://semaphoreci.com/api/v1/stanmd/vue-django/branches/develop/badge.svg)](https://semaphoreci.com/stanmd/vue-django)
 [![Updates](https://pyup.io/repos/github/NdagiStanley/vue-django/shield.svg)](https://pyup.io/repos/github/NdagiStanley/vue-django/)
 [![Python 3](https://pyup.io/repos/github/NdagiStanley/vue-django/python-3-shield.svg)](https://pyup.io/repos/github/NdagiStanley/vue-django/)
-[![Help Contribute to Open Source](https://www.codetriage.com/ndagistanley/vue-django/badges/users.svg)](https://www.codetriage.com/ndagistanley/vue-django)
 
 [https://vuedjango.herokuapp.com/](https://vuedjango.herokuapp.com/) is a deployed instance of this boilerplate.
 
@@ -52,7 +54,7 @@ $ npm run dev
 ```
 
 ## Deploy
-To deploy your django project
+To deploy your django project, still within `my-project` directory, run:
 
 `$ .deploy.sh`
 

diff --git a/docs/README.md b/docs/README.md
@@ -9,11 +9,12 @@
 
 [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://github.com/ellerbrock/open-source-badge/)
 [![Open Source Love](https://badges.frapsoft.com/os/mit/mit.svg?v=102)](https://github.com/ellerbrock/open-source-badge/)
-[![Code Climate](https://codeclimate.com/github/NdagiStanley/vue-django/badges/gpa.svg)](https://codeclimate.com/github/NdagiStanley/vue-django)
-<a href="https://codeclimate.com/github/NdagiStanley/vue-django"><img src="https://codeclimate.com/github/NdagiStanley/vue-django/badges/issue_count.svg" /></a>
+[![Help Contribute to Open Source](https://www.codetriage.com/ndagistanley/vue-django/badges/users.svg)](https://www.codetriage.com/ndagistanley/vue-django)
+
+[![Build Status](https://semaphoreci.com/api/v1/stanmd/vue-django/branches/develop/badge.svg)](https://semaphoreci.com/stanmd/vue-django)
 [![Updates](https://pyup.io/repos/github/NdagiStanley/vue-django/shield.svg)](https://pyup.io/repos/github/NdagiStanley/vue-django/)
 [![Python 3](https://pyup.io/repos/github/NdagiStanley/vue-django/python-3-shield.svg)](https://pyup.io/repos/github/NdagiStanley/vue-django/)
-[![Help Contribute to Open Source](https://www.codetriage.com/ndagistanley/vue-django/badges/users.svg)](https://www.codetriage.com/ndagistanley/vue-django)
+
 
 [https://vuedjango.herokuapp.com/](https://vuedjango.herokuapp.com/) is a deployed instance of this boilerplate. There is a docker image for vue-django that you can run to check it out locally:
 ```bash

diff --git a/template/app/tests.py b/template/app/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from views import index
+from app.views import index
 
 
 # Create your tests here.

diff --git a/template/format_index_html.py b/template/format_index_html.py
@@ -1,7 +1,7 @@
 import sys
 import fileinput
 
-file = 'templates/index.html'
+file = 'index.html'
 
 with open(file, "r+") as f:
     s = f.read()

diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
@@ -14,7 +14,7 @@ module.exports = {
       .assert.elementPresent('.hello')
       .assert.elementPresent('.logo')
       .assert.containsText('h1', 'Hello World!')
-      .assert.elementCount('p', 2)
+      .assert.elementCount('p', 1)
       .end(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/vuedj/settings.py b/template/vuedj/settings.py
@@ -133,8 +133,8 @@
 # Use nose to run all tests
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
-# Tell nose to measure coverage on the 'foo' and 'bar' apps
+# Tell nose to measure coverage on the apps
 NOSE_ARGS = [
     '--with-coverage',
-    '--cover-package=foo,bar',
+    '--cover-package=app',  # For multiple apps use '--cover-package=foo, bar'
 ]
diff --git a/vue-cli-interaction.exp b/vue-cli-interaction.exp
@@ -0,0 +1,21 @@
+#!/usr/bin/expect -f
+# To be used primarily in CI (continuous integration)
+set timeout 360
+set BRANCH_NAME $env(BRANCH_NAME)
+
+spawn vue init NdagiStanley/vue-django#$BRANCH_NAME my-project
+expect {
+    "Project name" { send "\n"; exp_continue }
+    "Project version" { send "\n"; exp_continue }
+    "Project description" { send "\n"; exp_continue }
+    "Author" { send "\n"; exp_continue }
+    "private" { send "\n"; exp_continue }
+    "Vue build" { send "\n"; exp_continue }
+    "Install vue-router?" { send "\n"; exp_continue }
+    "Use ESLint to lint your code?" { send "\n"; exp_continue }
+    "Pick an ESLint preset" { send "\n"; exp_continue }
+    "Setup unit tests" { send "\n"; exp_continue }
+    "Pick a test runner" { send "\n"; exp_continue }
+    "Setup e2e tests with Nightwatch?" { send "\n"; exp_continue }
+    eof
+}