Skip to content

fixing bootstrap 3 styles, TUS support and adding tests to patterns#255

Merged
vangheem merged 4 commits intomasterfrom
vangheem-backports
Jan 28, 2014
Merged

fixing bootstrap 3 styles, TUS support and adding tests to patterns#255
vangheem merged 4 commits intomasterfrom
vangheem-backports

Conversation

@garbas
Copy link
Copy Markdown
Contributor

@garbas garbas commented Jan 27, 2014

  • structure pattern and tests
  • add tree selector to related items
  • add tus support to dropzone

@garbas garbas mentioned this pull request Jan 27, 2014
39 tasks
@garbas
Copy link
Copy Markdown
Contributor Author

garbas commented Jan 28, 2014

:( ... i get 5 test failures on FF

 Firefox 26.0.0 (Linux): Executed 133 of 220 SUCCESS (0 secs / 12.488 secs)
.
Firefox 26.0.0 (Linux) Related Items test tree cancel FAILED
    expected true to equal false
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.equal@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:203
    @/home/rok/dev/plone/mockup/tests/pattern-relateditems-test.js:501
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733
Firefox 26.0.0 (Linux) Related Items test tree cancel FAILED
    expected true to equal false
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.equal@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:203
    @/home/rok/dev/plone/mockup/tests/pattern-relateditems-test.js:501
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733

 Firefox 26.0.0 (Linux): Executed 184 of 220 (1 FAILED) (0 secs / NaN secs)
 Firefox 26.0.0 (Linux): Executed 198 of 220 (1 FAILED) (0 secs / NaN secs)
 Firefox 26.0.0 (Linux): Executed 211 of 220 (1 FAILED) (0 secs / NaN secs)
.
Firefox 26.0.0 (Linux) Structure select item populates selection well FAILED
    expected 'Selected \n<span class="label label-default">\n  0\n</span>\n' to contain '1'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.contain@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:395
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:120
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733
Firefox 26.0.0 (Linux) Structure select item populates selection well FAILED
    expected 'Selected \n<span class="label label-default">\n  0\n</span>\n' to contain '1'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.contain@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:395
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:120
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733

 Firefox 26.0.0 (Linux): Executed 213 of 220 (2 FAILED) (0 secs / NaN secs)
.
Firefox 26.0.0 (Linux) Structure remove all from selection well FAILED
    expected 'Selected \n<span class="label label-default">\n  0\n</span>\n' to contain '2'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.contain@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:395
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:136
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733
Firefox 26.0.0 (Linux) Structure remove all from selection well FAILED
    expected 'Selected \n<span class="label label-default">\n  0\n</span>\n' to contain '2'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.contain@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:395
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:136
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733

 Firefox 26.0.0 (Linux): Executed 217 of 220 (3 FAILED) (0 secs / NaN secs)
.
Firefox 26.0.0 (Linux) Structure test copy button FAILED
    expected null to equal 'copy'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.equal@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:203
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:179
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733
Firefox 26.0.0 (Linux) Structure test copy button FAILED
    expected null to equal 'copy'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.equal@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:203
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:179
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733

Firefox 26.0.0 (Linux): Executed 218 of 220 (4 FAILED) (0 secs / NaN secs)
Firefox 26.0.0 (Linux) Structure test cut button FAILED
    expected null to equal 'cut'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.equal@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:203
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:188
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733
Firefox 26.0.0 (Linux) Structure test cut button FAILED
    expected null to equal 'cut'
    Assertion.prototype.assert@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:99
    Assertion.prototype.equal@/home/rok/dev/plone/mockup/bower_components/expect/expect.js:203
    @/home/rok/dev/plone/mockup/tests/pattern-structure-test.js:188
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4336
    Runner.prototype.runTest@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4724
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4802
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4649
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4659
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4597
    next/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4621
    Runnable.prototype.run@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4338
    next@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4609
    Runner.prototype.hook/<@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:4626
    timeslice@/home/rok/dev/plone/mockup/node_modules/mocha/mocha.js:5733

vangheem added a commit that referenced this pull request Jan 28, 2014
fixing bootstrap 3 styles and adding tests to patterns
@vangheem vangheem merged commit c566181 into master Jan 28, 2014
@coveralls
Copy link
Copy Markdown

Coverage Status

Changes Unknown when pulling bd04426 on vangheem-backports into * on master*.

@garbas
Copy link
Copy Markdown
Contributor Author

garbas commented Jan 28, 2014

i reverted pull request, please squash commits into one and description of commit the same as description of pull request (by git nazi), created new pull request #256

@vangheem
Copy link
Copy Markdown
Member

yah, I thought I did but then it just added another commit after my squash rebase and I didn't notice until after I already merged. Lame.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants