Corrected pushstate tests and update can.test.route #1098

Merged
merged 4 commits into from Jul 8, 2014

Conversation

Projects
None yet
3 participants
@ramblinjan
Contributor

ramblinjan commented Jun 18, 2014

Fixes pushstate domain tests to run properly. can.test.path will adjust the root path depending on whether tests have access to steal.

@daffl daffl added this to the 2.1.3 milestone Jun 18, 2014

@ramblinjan ramblinjan changed the title from Corrected pushstate tests, keep them from running in dist to Corrected pushstate tests and update can.test.route Jun 18, 2014

@daffl daffl added the Bug label Jun 19, 2014

stop();
makeTestingIframe(function(info, done){
- info.route.bindings.pushstate.root = "/";
+ info.route.bindings.pushstate.root = can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", "");

This comment has been minimized.

@daffl

daffl Jun 19, 2014

Contributor

Isn't can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", ""); the same as can.test.path("")?

@daffl

daffl Jun 19, 2014

Contributor

Isn't can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", ""); the same as can.test.path("")?

This comment has been minimized.

@justinbmeyer

justinbmeyer Jun 19, 2014

Contributor

I think steal adds a .js to ""

Sent from my iPhone

On Jun 19, 2014, at 4:01 PM, David Luecke notifications@github.com wrote:

In route/pushstate/pushstate_test.js:

            stop();
            makeTestingIframe(function(info, done){
  •               info.route.bindings.pushstate.root = "/";
    
  •               info.route.bindings.pushstate.root = can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", "");
    
    Isn't can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", ""); the same as can.test.path("")?


Reply to this email directly or view it on GitHub.

@justinbmeyer

justinbmeyer Jun 19, 2014

Contributor

I think steal adds a .js to ""

Sent from my iPhone

On Jun 19, 2014, at 4:01 PM, David Luecke notifications@github.com wrote:

In route/pushstate/pushstate_test.js:

            stop();
            makeTestingIframe(function(info, done){
  •               info.route.bindings.pushstate.root = "/";
    
  •               info.route.bindings.pushstate.root = can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", "");
    
    Isn't can.test.path("route/pushstate/testing.html", true).replace("route/pushstate/testing.html", ""); the same as can.test.path("")?


Reply to this email directly or view it on GitHub.

This comment has been minimized.

@daffl

daffl Jun 19, 2014

Contributor

Even to something ending with /?

@daffl

daffl Jun 19, 2014

Contributor

Even to something ending with /?

daffl added a commit that referenced this pull request Jul 8, 2014

Merge pull request #1098 from bitovi/pushstate-root-test
Corrected pushstate tests and update can.test.route

@daffl daffl merged commit 1557fc5 into master Jul 8, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@daffl daffl deleted the pushstate-root-test branch Jul 8, 2014

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