Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#6854 Reorganize tests #6861

Merged
merged 2 commits into from
Feb 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('ClojureTutorial notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/clojure/ClojureTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/clojure/ClojureTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
var BeakerXPageObject = require('../beakerx.po.js');
var beakerxPO;

describe('2nd Y Axis tests', function () {
describe('2nd Y Axis js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/2ndYaxisTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/2ndYaxisTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
var BeakerXPageObject = require('../beakerx.po.js');
var beakerxPO;

describe('Autotranslation Groovy to JavaScript and D3 tests', function () {
describe('Autotranslation Groovy to JavaScript and D3 js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/AutoTranslationGroovyTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/AutoTranslationGroovyTest.ipynb');
});

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
var BeakerXPageObject = require('../beakerx.po.js');
var beakerxPO;

describe('big ints tests', function () {
describe('big ints js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/BigIntsTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/BigIntsTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
var BeakerXPageObject = require('../beakerx.po.js');
var beakerxPO;

describe('Charting groovy tests', function () {
describe('Charting groovy js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/ChartingTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/ChartingTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Tests for combination of code and magics', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/codeAndMagicsTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/codeAndMagicsTest.ipynb');
});

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('(Groovy) Testing of EasyForm', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/EasyFormTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/EasyFormTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
var BeakerXPageObject = require('../beakerx.po.js');
var beakerxPO;

describe('Groovy tests', function () {
describe('Groovy js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/GroovyTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/GroovyTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Java widgets notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/JavaWidgetsTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/JavaWidgetsTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('(Groovy) Testing of Loading Magic Command', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/LoadMagicCommandTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/LoadMagicCommandTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Testing of plot Actions', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/PlotActionsTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/PlotActionsTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ var PlotHelperObject = require('../plot.helper.js');
var beakerxPO;
var plotHelper;

describe('Plot groovy tests', function () {
describe('Plot groovy js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
plotHelper = new PlotHelperObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/PlotGroovyTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/PlotGroovyTest.ipynb');
});

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('(Groovy) Testing of showing the null execution result', function() {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/ShowNullExecutionResultTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/ShowNullExecutionResultTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Testing of table Actions', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/groovy/TableActionsTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/groovy/TableActionsTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
6 changes: 3 additions & 3 deletions test/tests/java/javaTest.js → test/js/java/javaTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('JavaTutorial notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/java/JavaTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/java/JavaTest.ipynb');
}, 2);

afterAll(function () {
Expand Down Expand Up @@ -65,10 +65,10 @@ describe('JavaTutorial notebook', function () {
});

describe('Run 7th cell. ', function () {
it('Output contains "beakerx/test/notebooks"', function () {
it('Output contains "beakerx/test/ipynb"', function () {
beakerxPO.runCodeCellByIndex(5);
beakerxPO.kernelIdleIcon.waitForEnabled();
beakerxPO.runCellAndCheckOutputText(6, 'beakerx\.test\.notebooks');
beakerxPO.runCellAndCheckOutputText(6, 'beakerx\.test\.ipynb');
}, 2);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Kotlin-example notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/kotlin/KotlinTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/kotlin/KotlinTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ var beakerxPO;
var plotHelper;
var tableHelper;

describe('Publish plot groovy notebook tests', function () {
describe('Publish plot groovy notebook js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
plotHelper = new PlotHelperObject();
tableHelper = new TableHelperObject();
beakerxPO.runNotebookByUrl('/test/notebooks/nbviewer/PlotNbviewerTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/nbviewer/PlotNbviewerTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
var BeakerXPageObject = require('../beakerx.po.js');
var beakerxPO;

describe('Autotranslation Python to JavaScript and D3 tests', function () {
describe('Autotranslation Python to JavaScript and D3 js', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/python/AutoTranslationPythonTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/python/AutoTranslationPythonTest.ipynb');
});

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('(Python) Testing of EasyForm', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/python/EasyFormPythonTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/python/EasyFormPythonTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Testing of Plot (python)', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/python/PlotPythonTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/python/PlotPythonTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Testing of table (python)', function () {
beforeAll(function () {
beakerxPO = new BeakerXPageObject();
tableHelper = new TableHelperObject();
beakerxPO.runNotebookByUrl('/test/notebooks/python/TableAPIPythonTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/python/TableAPIPythonTest.ipynb');
});

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Scala notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/scala/PlotScalaTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/scala/PlotScalaTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Scala notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/scala/ScalaTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/scala/ScalaTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Scala notebook', function () {

beforeAll(function () {
beakerxPO = new BeakerXPageObject();
beakerxPO.runNotebookByUrl('/test/notebooks/scala/SparkScalaTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/scala/SparkScalaTest.ipynb');
});

afterAll(function () {
Expand Down
2 changes: 1 addition & 1 deletion test/tests/sql/sqlTest.js → test/js/sql/sqlTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('SQL Examples notebook', function () {
beforeAll(function () {
beakerxPO = new BeakerXPageObject();
tableHelper = new TableHelperObject();
beakerxPO.runNotebookByUrl('/test/notebooks/sql/SQLTest.ipynb');
beakerxPO.runNotebookByUrl('/test/ipynb/sql/SQLTest.ipynb');
}, 2);

afterAll(function () {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion test/wdio.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

exports.config = {
specs: [
'./tests/**/*.js'
'./js/**/*.js'
],
exclude: [],
maxInstances: 1,
Expand Down