Skip to content

C
converse.js
Commit f4ab194c authored by JC Brand's avatar JC Brand
Browse files
Options

Merge branch 'master' of github.com:jcbrand/converse.js 

Conflicts:
	CONTRIBUTING.rst
parents 597cf662 e9d31ce6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
CONTRIBUTING.rst
View file @ f4ab194c
...@@ -20,6 +20,7 @@ Before submitting a pull request ...@@ -20,6 +20,7 @@ Before submitting a pull request
Add tests for your bugfix or feature Add tests for your bugfix or feature
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Add a test for any bug fixed or feature added. We use Jasmine Add a test for any bug fixed or feature added. We use Jasmine
for testing. for testing.
...@@ -27,6 +28,7 @@ Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how ...@@ -27,6 +28,7 @@ Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how
the tests are implemented. the tests are implemented.
Check that the tests pass Check that the tests pass
~~~~~~~~~~~~~~~~~~~~~~~~~
Check that the Jasmine tests complete sucessfully. Open tests.html in your Check that the Jasmine tests complete sucessfully. Open tests.html in your
browser, and the tests will run automatically. browser, and the tests will run automatically.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7