| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
| |
As @mhl points out, this more clearly indicates that they may come back
at some point.
|
|
|
|
|
| |
So that files attached to different messages with the same name and
url_part don't get overwritten.
|
| |
|
| |
|
|
|
|
|
|
| |
Conflicts:
app/views/request/_incoming_correspondence.html.erb
|
|
|
|
|
|
| |
Conflicts:
spec/integration/view_request_spec.rb
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
This was disabled for hidden requests as the download was by redirect,
allowing people who have not been authenticated to conceivably access
the download. We'll be moving to send_file instead, so can restore it.
|
|
|
|
|
| |
The third (and any subsequent) session created shares a session id with
the second without this explicit reset.
|
|
|
|
| |
We're testing the code path where there is no converter here.
|
| |
|
|
|
|
|
|
|
| |
Adds a spec for what we want to see - no message text in
correspondence.txt, and no attachments. Refactors the
simple_correspondence templates to make it clearer that these are doing
the same job as the html.erb ones, for text.
|
|
|
|
|
|
|
|
|
| |
Each part is a separate sentence, and we're going to reuse some of them
in the text view.
Conflicts:
spec/integration/view_request_spec.rb
|
|
|
|
|
| |
Make it an integration spec so we don't need to touch the internals so
much.
|
| |
|
| |
|
|
|
|
|
| |
Make specs that depend on multiple controllers and models interacting
integration specs.
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
app/views/request/_incoming_correspondence.html.erb
Conflicts:
spec/integration/view_request_spec.rb
|
|
|
|
| |
Different messages for normal user, requester and admin user.
|
|
|
|
| |
Add a failing test for what should happen on request hiding.
|
|
|
|
| |
outside initialization e.g. in tests.
|
| |
|
|
|
|
| |
the URL) off by default in model, controller, and helper tests. This means we can supply the locale as a param. Turn it on specifically for a couple of controller tests that test routing, and change other url localization tests into integration tests.
|
|
|
|
| |
request.query_parameters. The latter has unexpected results when a querystring parameter of 'action' or 'controller' is supplied. Fixes #981.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
404s on non-local requests are to be rendered with our custom template (such that this template can be overriden by themes in the usual way). Note that requests to the admin interface are considered local.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile.lock
app/controllers/public_body_controller.rb
app/mailers/track_mailer.rb
app/views/request/_hidden_correspondence.html.erb
app/views/request/_sidebar.html.erb
app/views/request/hidden.html.erb
app/views/request/new_please_describe.html.erb
app/views/request/preview.html.erb
app/views/user/show.html.erb
config/environment.rb
config/routes.rb
spec/controllers/public_body_controller_spec.rb
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/controllers/admin_request_controller.rb
app/controllers/admin_track_controller.rb
app/controllers/request_controller.rb
app/controllers/services_controller.rb
app/helpers/link_to_helper.rb
app/mailers/request_mailer.rb
app/models/application_mailer.rb
app/models/info_request.rb
app/views/admin_censor_rule/edit.html.erb
app/views/admin_censor_rule/new.html.erb
app/views/admin_public_body/_form.html.erb
app/views/admin_public_body/_locale_selector.html.erb
app/views/admin_public_body/_one_list.html.erb
app/views/admin_public_body/edit.html.erb
app/views/admin_public_body/list.html.erb
app/views/admin_public_body/new.html.erb
app/views/admin_request/_incoming_message_actions.html.erb
app/views/admin_request/edit.html.erb
app/views/admin_request/edit_comment.html.erb
app/views/admin_request/edit_outgoing.html.erb
app/views/admin_request/list.html.erb
app/views/admin_request/list_old_unclassified.html.erb
app/views/admin_request/show.html.erb
app/views/admin_track/_some_tracks.html.erb
app/views/admin_track/list.html.erb
app/views/admin_user/edit.html.erb
app/views/admin_user/list.html.erb
app/views/admin_user/show.html.erb
app/views/general/_footer.html.erb
app/views/general/exception_caught.html.erb
app/views/help/contact.html.erb
app/views/layouts/default.html.erb
app/views/public_body/_alphabet.html.erb
app/views/request/_request_listing_single.html.erb
app/views/request/_sidebar.html.erb
app/views/request/new.html.erb
app/views/request/show.html.erb
app/views/request_mailer/external_response.rhtml
app/views/request_mailer/fake_response.rhtml
config/environment.rb
config/environments/production.rb
config/routes.rb
spec/controllers/admin_censor_rule_controller_spec.rb
spec/controllers/request_controller_spec.rb
spec/controllers/track_controller_spec.rb
spec/helpers/link_to_helper_spec.rb
spec/mailers/request_mailer_spec.rb
spec/models/info_request_spec.rb
spec/spec_helper.rb
spec/views/public_body/show.html.erb_spec.rb
spec/views/request/show.html.erb_spec.rb
vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
|
| |
| |
| |
| | |
page asking for more info
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
clean copy of the xapian index with fixtures loaded is required.
|
|
|
|
| |
require an existing user. Fixes #719.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
It’s weird that there’s so much code here that implicitly
assumes File.dirname(__FILE__) is an absolute path, because
really in general it very much is not! This assumption was
invalidated by the recent bundler-awareness changes.
|
|
|
|
| |
query string, even when the variety of search is "all". Fixes #448
|
|
|
|
|
|
| |
1. Remove useless call to spec_helper’s basic_auth_login method
2. Use Base64.encode64, rather than b64encode which also prints
the encoded string to standard output.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the "log in as" function after 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b
would attempt to log the admin user out before issuing the redirect. Unfortunately
this approach does not work on WhatDoTheyKnow, where the admin pages are served via
a different domain (secure.mysociety.org) and so do not share session information with
the rest of the site.
This commit changes it to mark the PostRedirect with circumstance == "login_as",
which signals the user controller to log out the previous user even if they are
an admin. In other words, the user is logged out on the main site rather than the
admin site, skirting this problem.
Closes #450.
|
|
|
|
| |
Fixes #446. See issue for details.
|
|
|
|
|
|
|
|
|
| |
The ad hoc specification of fixtures has been an ongoing source
of bugs in the tests. The straw that broke the camel’s back is
that 7c6eb09 requires the fixtures to be loaded in order (i.e.
children before their parents), and it would have been a painful
process to reorder all the dozens of different fixture lists,
but the test system ought to be more reliable this way.
|