Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7f006d3
Tests: Add requirejs text for intern POC
apsdehal Jun 11, 2015
344eba7
Tests: Add intern grunt and config setting
apsdehal Jun 11, 2015
f2a291f
Tests: Modify bootstrap and css js files to return functions
apsdehal Jun 12, 2015
1954384
Tests: Shift intern tests to use intern qunit
apsdehal Jun 12, 2015
1073182
Tests: Add intern dependency
apsdehal Jun 12, 2015
f7b63ea
Tests: Complete the POC by modifying setup and teardown
apsdehal Jun 12, 2015
805c21e
Tests: Deps related changes
apsdehal Jun 13, 2015
9ad657e
Tests: Changes for POC to work
apsdehal Jun 13, 2015
843ba49
Tests: More changes to bring stuff atleast in working condition
apsdehal Jun 17, 2015
e724301
Tests: Remove test swarm stuff
apsdehal Jun 18, 2015
215d254
Tests: Fix some of accordion test
apsdehal Jun 18, 2015
22ea3d4
Tests: Push current structure
apsdehal Jun 25, 2015
08136e9
Tests: Revert back to original bug
apsdehal Jun 25, 2015
bda9302
Tests: New POC
apsdehal Jul 7, 2015
4f92416
Build: Shift qunit-assert-close to apsdehal's fork
apsdehal Jul 8, 2015
6add4f0
Tests: Move to a working POC
apsdehal Jul 8, 2015
251ff75
Tests: Fix issue of intern results
apsdehal Jul 8, 2015
2f75843
Tests: POC works now for accordion/core
apsdehal Jul 8, 2015
a317514
Tests: Extend POC to whole accordion
apsdehal Jul 8, 2015
12c2a23
Tests: Shift QUnit.equiv to assert.deepEqual
apsdehal Jul 8, 2015
e8e5586
Tests: Fix the equalHeight problem with accordion
apsdehal Jul 8, 2015
2d16a6c
Tests: Uncomment handle-click test in core
apsdehal Jul 8, 2015
2aeedac
Tests: Remove autostart command
apsdehal Jul 8, 2015
4e96e8c
Tests: Shift autocomplete to intern
apsdehal Jul 9, 2015
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
Prev Previous commit
Next Next commit
Tests: Move to a working POC
  • Loading branch information
apsdehal committed Jul 8, 2015
commit 6add4f05f30d4e47264ba3c6fe75ead1d9de2651
2 changes: 1 addition & 1 deletion tests/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ define( [ "./config-helper" ], function ( configHelper ) {
"jshint": "external/jshint/jshint",
"lib": "tests/lib",
"qunit-assert-classes": "external/qunit-assert-classes/qunit-assert-classes",
"qunit-assert-close": "external/qunit-assert-close/qunit-assert-close",
// "qunit-assert-close": "external/qunit-assert-close/qunit-assert-close",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this commented out?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to look into this issue more deeply, mapping was not working only for qunit-assert-close. Requirejs timed out always while loading it.

"text": "external/requirejs-text/text",
"ui": "ui",
"unit": "tests/unit",
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/helper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
define([
"jquery"
"jquery",
"qunit"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

], function( $ ) {

var exports = {};
Expand Down
6 changes: 3 additions & 3 deletions tests/lib/qunit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ define( [
"intern!qunit",
"jquery",
"qunit-assert-classes",
"qunit-assert-close",
"external/qunit-assert-close/qunit-assert-close",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't this mapped?

"lib/qunit-assert-domequal",
// "phantom-bridge"
], function( QUnit, $ ) {

QUnit.config.autostart = false;
// QUnit.config.autostart = false;
QUnit.config.requireExpects = true;

QUnit.config.testTimeout = 3000;
// QUnit.config.urlConfig.push({
// id: "nojshint",
// label: "Skip JSHint",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/accordion/core.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define( [
"intern!qunit",
"lib/qunit",
"jquery",
"./helper",
"ui/accordion"
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/accordion/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ define( [
"jquery",
"lib/helper",
"lib/css",
// "text!tests/unit/accordion/accordion.html",
"text!tests/unit/accordion/accordion.html",
"ui/accordion",
"jquery-simulate"
], function( QUnit, $, helper, cssjs
// , htmlContent
, htmlContent
) {
var htmlContent = "hi";
// var htmlContent = "hi";
// QUnit.start();
cssjs( { module: "core accordion" } );

Expand Down