Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Some trivial fixes to new e2e harness #9706

Closed
wants to merge 4 commits into from
Closed

Some trivial fixes to new e2e harness #9706

wants to merge 4 commits into from

Conversation

shahata
Copy link
Contributor

@shahata shahata commented Oct 20, 2014

  1. Removing some redundant file (I hope I'm not missing anything)
  2. Add body tag to fixture + indentation
  3. Minor refactor to editting jquery script tag
  4. Update npm shrinkwrap

@caitp
Copy link
Contributor

caitp commented Oct 20, 2014

the missing body tag is pointless --- the rest is fine.

@caitp
Copy link
Contributor

caitp commented Oct 20, 2014

In the future, please leave comments on a PR instead of doing this

@shahata
Copy link
Contributor Author

shahata commented Oct 20, 2014

Sure, I only got around now to looking at this (after it was merged). This is some really cool stuff!

@shahata
Copy link
Contributor Author

shahata commented Oct 20, 2014

I put those things in separate commits only so you'll be able to pick which of those you want, do you prefer I squash everything except for the body tag thing?

@caitp
Copy link
Contributor

caitp commented Oct 20, 2014

no problem --- I don't really have anything against adding the body tag, so it basically LGTM --- but it just adds a bunch of gunk to the fixture that isn't really needed.

We often write layout tests this way because it helps minimize the amount of code in the test files, which is really nice.

Don't worry about squashing, but I'd rather the body tag commit were removed --- just to keep the fixture a bit smaller

@shahata
Copy link
Contributor Author

shahata commented Oct 20, 2014

Dropped. Should I merge this then?

@caitp
Copy link
Contributor

caitp commented Oct 20, 2014

yup, lgtm

@caitp
Copy link
Contributor

caitp commented Oct 20, 2014

actually hang on --- @petebacondarwin can you make sure the npm-shrinkwrap is okay first?

some packages were using versions that do not match semver@4 semantics and therefore generated errors when trying to create shrinkwrap with npm@2.x. this shrinkwrap will make it much easier to update the shrinkmap from now on
@rodyhaddad rodyhaddad added this to the 1.3.x milestone Oct 21, 2014
shahata referenced this pull request Oct 21, 2014
It's tinier than jsdom, and seems to work okay for generating the fixtures.
@caitp
Copy link
Contributor

caitp commented Oct 24, 2014

so, still waiting on pete to ok the changes, but I think it should be okay --- and if not, it probably won't affect anyone right away :>

@shahata shahata closed this in 42f7c80 Oct 24, 2014
shahata added a commit that referenced this pull request Oct 24, 2014
shahata added a commit that referenced this pull request Oct 24, 2014
shahata added a commit that referenced this pull request Oct 24, 2014
some packages were using versions that do not match semver@4 semantics and therefore generated
errors when trying to create shrinkwrap with npm@2.x. this shrinkwrap will make it much easier to
update the shrinkmap from now on

Closes #9706
@petebacondarwin
Copy link
Contributor

Sorry I missed that one.

Generally I have been editing the npm-shrinkwrap.json file after cleaning to make sure it is only updating the versions of modules that I specifically want to change. In this diff it has updated readable-stream in a number of places, which could or could not have an impact. It is safer not to do this, IMO.

@caitp or @shahata - can you see if iit and ddescribe are still working with this update, since that doesn't get checked by and CI builds.

@caitp
Copy link
Contributor

caitp commented Oct 25, 2014

@caitp or @shahata - can you see if iit and ddescribe are still working with this update, since that doesn't get checked by and CI builds.

works here

@shahata
Copy link
Contributor Author

shahata commented Oct 25, 2014

@petebacondarwin I intentionally added the updates to readable-stream and sting_decoder as a separate commit since I wasn't sure you'd like that :). I think it is a good idea though since those two packages use a semver@4 incompatible version which is probably why @caitp had some problem with generating the npm shrinkwrap with npm@2. Now shrinkwrap will work without any errors.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants