Commit 288a0af1 authored by Jaden Diefenbaugh's avatar Jaden Diefenbaugh

moved protractor to buildout, updated assoc docs, more general basic report test cases

parent c3ff78aa
...@@ -29,11 +29,6 @@ describe('reports app', function(){ ...@@ -29,11 +29,6 @@ describe('reports app', function(){
it('should load', function(){ it('should load', function(){
expect(browser.getTitle()).toEqual('BEAT - Public Reports'); expect(browser.getTitle()).toEqual('BEAT - Public Reports');
}); });
it('should have no reports', function(){
let noReportsText = browser.findElement(by.className('not-found'));
expect(noReportsText.getText()).toBe('No report found');
});
}); });
// /reports/user // /reports/user
...@@ -59,9 +54,9 @@ describe('reports app', function(){ ...@@ -59,9 +54,9 @@ describe('reports app', function(){
}); });
// before adding a report, there shouldn't be any // before adding a report, there shouldn't be any
it('should have no reports', function(){ it('should not have the "user/test" report', function(){
let noReportsText = browser.findElement(by.className('not-found')); let noReportsText = browser.findElement(by.css('.name > a'));
expect(noReportsText.getText()).toBe('No report found'); expect(noReportsText.getText()).not.toBe('user/test');
}); });
// create a report // create a report
......
...@@ -103,8 +103,8 @@ eggs = ${buildout:eggs} ...@@ -103,8 +103,8 @@ eggs = ${buildout:eggs}
[node] [node]
recipe = gp.recipe.node recipe = gp.recipe.node
npms = bower npms = bower protractor
scripts = bower scripts = bower protractor webdriver-manager
[bower] [bower]
recipe = bowerrecipe recipe = bowerrecipe
......
...@@ -195,19 +195,11 @@ End-to-End Testing ...@@ -195,19 +195,11 @@ End-to-End Testing
Setup Setup
===== =====
Currently, testing the BEAT web platform with Protractor requires additional setup after successfully setting up the project locally: Currently, testing the BEAT web platform with Protractor requires additional setup after successfully setting up the project locally. Download/update the webdriver-manager's dependencies (Selenium & more):
- Install Protractor
.. code:: bash
./parts/buildout-node/node-*/bin/npm i -g protractor
- Download/update the webdriver-manager's dependencies (Selenium & more)
.. code:: bash .. code:: bash
./parts/buildout-node/node-*/bin/webdriver-manager update ./bin/webdriver-manager update
Running tests with the provided script Running tests with the provided script
====================================== ======================================
...@@ -235,7 +227,7 @@ _____________________________ ...@@ -235,7 +227,7 @@ _____________________________
.. code:: bash .. code:: bash
./parts/buildout-node/node-*/bin/webdriver-manager start ./bin/webdriver-manager start
.. important:: .. important::
...@@ -245,7 +237,7 @@ _____________________________ ...@@ -245,7 +237,7 @@ _____________________________
.. code:: bash .. code:: bash
./parts/buildout-node/node-*/bin/protractor protractor-conf.js ./bin/protractor protractor-conf.js
- If you started your webdriver server as a background process, you can kill all webdriver processes - If you started your webdriver server as a background process, you can kill all webdriver processes
......
...@@ -50,9 +50,9 @@ fi ...@@ -50,9 +50,9 @@ fi
# run the web server # run the web server
beat_cmd='./bin/django runserver' beat_cmd='./bin/django runserver'
# spin up web manager # spin up web manager
webdriver_cmd='./parts/buildout-node/node-*/bin/webdriver-manager start' webdriver_cmd='./bin/webdriver-manager start'
# run tests # run tests
protractor_cmd='./parts/buildout-node/node-*/bin/protractor ./protractor-conf.js' protractor_cmd='./bin/protractor ./protractor-conf.js'
# start bg processes # start bg processes
echo 'Output from the BEAT web server &' \ echo 'Output from the BEAT web server &' \
......
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