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

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

Merged
merged 4 commits into from
Jul 8, 2014

Conversation

ramblinjan
Copy link
Contributor

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 Corrected pushstate tests, keep them from running in dist 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", "");
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Even to something ending with /?

daffl added a commit that referenced this pull request Jul 8, 2014
Corrected pushstate tests and update can.test.route
@daffl daffl merged commit 1557fc5 into master Jul 8, 2014
@daffl daffl deleted the pushstate-root-test branch July 8, 2014 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants