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.

Sign up for GitHub

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

Jump to bottom

Support for multiple file upload. #825

Merged
merged 1 commit into from
Sep 26, 2012
Merged

Support for multiple file upload. #825

merged 1 commit into from
Sep 26, 2012

Conversation

jarl-dk
Copy link
Contributor

@jarl-dk jarl-dk commented Sep 17, 2012

I don't know what the plans for merging from 1.1_stable to master is.

But since all focus is on master I am switching to use master as well... But I would like to see the support for multiple file upload, so here is a pull request for that. it is basically a cherry-pick from 1.1_stable

@jarl-dk
Support for multiple file upload.
3e2d7c2 
Squashed commit of the following:

commit fb88141
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 22:06:07 2012 +0200

    Improved implementation. Removing need for YAML. Extending the driver API to take an Array when 'multiple' attribute is present.

commit 977f1c5
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 11:56:04 2012 +0200

    Changing decision criteria to support 1.8.7

commit b217dee
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 10:38:16 2012 +0200

    Support for 'multiple' attribute in input tags, see teamcapybara#778

commit 155b9fc
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 10:33:00 2012 +0200

    Test that demonstrates lack of support for 'multiple' attribute in input tags, see teamcapybara#778

Conflicts:

	lib/capybara/node/actions.rb
	lib/capybara/selenium/node.rb
	lib/capybara/spec/session/attach_file_spec.rb
@jarl-dk
Copy link
Contributor Author

jarl-dk commented Sep 19, 2012

So can we merge this in master? It's already in 1.1_stable

@jnicklas
Copy link
Collaborator

Honestly I thought we had merged this to master. I'm very confused now. That's my bad for not reviewing pull requests more carefully. Give me some time to review this, please.

@jarl-dk
Copy link
Contributor Author

jarl-dk commented Sep 26, 2012

The pull request you are thinking of is probably #778 (a PR for 1.1_stable). This is an equivalent pull request, but just for master. Since all improvements are happening there I have started to use master/HEAD. So I would be happy to see support for multiple file upload there as well...

Jarl

jnicklas added a commit that referenced this pull request Sep 26, 2012
@jnicklas
Merge pull request #825 from softace/master_multiple_file_upload
6ffdea1 
Support for multiple file upload.
@jnicklas jnicklas merged commit 6ffdea1 into teamcapybara:master Sep 26, 2012
@jnicklas
Copy link
Collaborator

Okay, I merged this, and I'll revert the changes to 1.1 stable at some point. Silly me for not being more vigilant about where the pull request was sent to.

@jarl-dk
Copy link
Contributor Author

jarl-dk commented Sep 26, 2012

I am sorry that I didn't emphasize this in the initial pull-request (for
1.1_stable).

I didn't, at that time, know the status of master, but it seems relatively
stable...

Thanks a lot.

Jarl

2012/9/26 Jonas Nicklas notifications@github.com

Okay, I merged this, and I'll revert the changes to 1.1 stable at some
point. Silly me for not being more vigilant about where the pull request
was sent to.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/825#issuecomment-8888389.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jarl-dk @jnicklas