summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelinesRobert Speicher2015-07-292-24/+9
| | | | Prior, CI seemed to be freezing after running these specs.
* Update Markdown feature to allow for multiple pipelinesRobert Speicher2015-07-282-163/+209
|
* Add RelativeLinkFilter section to Markdown fixtureRobert Speicher2015-07-281-0/+7
|
* Move MarkdownFeature to its own support fileRobert Speicher2015-07-282-115/+114
| | | | | This file's about to get much bigger and this removes some of the extra noise.
* Make links inside ignored elements uniqueRobert Speicher2015-07-281-3/+3
| | | | | This is to prevent false matches since the Autolink section uses about.gitlab.com as well.
* Break up SanitizationFilter feature specsRobert Speicher2015-07-281-16/+37
|
* Use aggregate_failures where appropriateRobert Speicher2015-07-281-34/+53
|
* Minor Markdown feature spec reorganizationRobert Speicher2015-07-281-46/+47
|
* Simplify AutolinkFilter specsRobert Speicher2015-07-281-16/+12
|
* Change before(:all) -> let! to avoid leaking data across testsStan Hu2015-07-281-15/+15
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9495
* Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-281-2/+4
|\ | | | | | | | | | | | | | | Return comments in created order in merge request API Closes #1832 See merge request !985
| * Return comments in created order in merge request APIStan Hu2015-07-161-2/+4
| | | | | | | | Closes #1832
* | Merge branch 'fix-quotes-in-branch' into 'master'Douwe Maan2015-07-281-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit data retrieval when branch name has single quotes Quotes in ref names need to be escaped properly in JavaScript. Closes #1724 See merge request !1046
| * | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-261-1/+2
| | | | | | | | | | | | Closes #1724
* | | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-271-2/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Create project services on Project creation Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354 See merge request !1045
| * | Create project services on Project creationrs-dev-issue-306Robert Speicher2015-07-251-0/+7
| | |
| * | Only create :admin user in the one test where it's usedRobert Speicher2015-07-251-2/+3
| | |
* | | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-251-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix the "Reload with full diff" URL button On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode. Closes #2041 See merge request !1019
| * | Fix the "Reload with full diff" URL buttonStan Hu2015-07-231-0/+6
| | | | | | | | | | | | | | | | | | | | | On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to diff.json. Closes #2041
* | | Merge branch 'fix-error-500-when-no-head' into 'master'Valery Sizov2015-07-241-1/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 when no HEAD is available Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Error: ``` NoMethodError - undefined method `sha' for nil:NilClass: app/helpers/projects_helper.rb:281:in `readme_cache_key' app/views/projects/_readme.html.haml:10:in `_app_views_projects__readme_html_haml___2036282917939462960_70154565285700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:306:in `render_partial' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:279:in `block in render' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `instrument' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:278:in `render' actionview (4.1.11) lib/action_view/renderer/renderer.rb:47:in `render_partial' actionview (4.1.11) lib/action_view/helpers/rendering_helper.rb:35:in `render' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `block in render_with_haml' haml (4.0.5) lib/haml/helpers.rb:89:in `non_haml' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `render_with_haml' app/views/projects/show.html.haml:47:in `_app_views_projects_show_html_haml__1458303859692972698_70154948164180' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' ``` Closes https://github.com/gitlabhq/gitlabhq/issues/9484, but there may be some other issue there. See merge request !1041
| * | | Fix Error 500 when browsing projects with no HEADStan Hu2015-07-241-1/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Closes https://github.com/gitlabhq/gitlabhq/issues/9484
* | | Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-242-20/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label. ![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png) ![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png) ![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png) ![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png) See merge request !927
| * | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-232-20/+20
| |/ /
* | | Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-242-10/+37
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Make username parameter for Users#show case-insensitive Closes #2012 See merge request !996
| * | Add User.find_by_username!rs-issue-2012Robert Speicher2015-07-231-0/+12
| | |
| * | Make username parameter for Users#show case-insensitiveRobert Speicher2015-07-181-10/+25
| | | | | | | | | | | | Closes #2012
* | | Merge branch 'rs-security-spec-speed' into 'master' Douwe Maan2015-07-2215-425/+371
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up security feature specs Before: `rspec spec/features/security/ 0.12s user 0.04s system 0% cpu 3:38.00 total` After: `rspec spec/features/security/ 0.12s user 0.04s system 0% cpu 1:40.58 total` The majority of the speed improvements is from two things: 1. Instead of using our standard `login_as` helper in the matchers, we take advantage of the `Warden::Test::Helpers` version of the method which bypasses the login form and logs the user in directly. We were essentially testing that filling out the login form works hundreds of times. 2. There were many tests that verified if a user of a certain access level (master, owner, reporter, guest) had access to a resource. Unfortunately we were creating every type of user for each test even though a test was only verifying one of them at a time. Now the tests only create the one user role they're testing. See merge request !1023
| * | | Move spec/features/admin/security_spec to spec/features/securityrs-security-spec-speedRobert Speicher2015-07-221-0/+2
| | | |
| * | | Consolidate group access specs into one fileRobert Speicher2015-07-225-353/+284
| | | |
| * | | Move custom matchers to their own files under spec/support/matchersRobert Speicher2015-07-222-10/+9
| | | |
| * | | Remove redundant Profile access test casesRobert Speicher2015-07-221-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | The user being created was no different than what `be_allowed_for` was doing behind the scenes so we were essentially testing all user-level accesses twice.
| * | | Remove be_not_found_for matcherRobert Speicher2015-07-221-5/+0
| | | | | | | | | | | | | | | | It was only used in one test, and the test was kind of redundant.
| * | | Move access-related matchers to their own moduleRobert Speicher2015-07-2211-35/+72
| | | |
| * | | Remove unused `be_valid_commit` matcherRobert Speicher2015-07-211-9/+0
| | | |
* | | | Clearing the entire Redis cache may be too expensive; just useStan Hu2015-07-211-6/+2
| | | | | | | | | | | | | | | | the repository expire_cache method
* | | | Fix 404 error in files view after deleting the last file in a repositoryStan Hu2015-07-213-7/+42
|/ / / | | | | | | | | | Closes #1362
* | | GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-202-0/+6
|/ / | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | Add test case for clicking line number anchor iconrs-issue-988-testRobert Speicher2015-07-172-1/+11
| |
* | Merge branch 'add-support-remove-milestone' into 'master'Stan Hu2015-07-171-0/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for destroying project milestones ### What does this MR do? This MR adds a "Remove" button to the project milestones page and the milestone page itself. ### Why was this MR needed? Because lots of people talked about needing to clean their toilets. :) ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/1504 ### Screenshots ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef8c7a3ea1db7b37cccae3869ac4de0a/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/33eb01c7bc30fb235de96db5efb8746d/image.png) See merge request !980
| * | Add support for destroying project milestonesStan Hu2015-07-171-0/+28
| |/ | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* | Do not disappoint rubocop.validate_token_and_url_format_for_gitlab_ciMarin Jankovski2015-07-171-1/+1
| |
* | Add specs for gitlab ci service validity.Marin Jankovski2015-07-172-0/+39
| |
* | Fix failing specs after adding format verification for token and project url ↵Marin Jankovski2015-07-172-2/+2
|/ | | | in gitlab ci service.
* Merge branch 'rs-fix-coverage' into 'master'Dmitriy Zaporozhets2015-07-142-8/+11
|\ | | | | | | | | | | | | | | | | | | Move coverage-related setup back to spec_helper These tools must be loaded before our regular Rails environment. Partially reverts 57830201a9152b56ccf65a98275601617f44653d See merge request !976
| * Move coverage-related setup back to spec_helperrs-fix-coverageRobert Speicher2015-07-132-8/+11
| | | | | | | | These tools must be loaded before our regular Rails environment.
* | Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-132-6/+6
| |
* | Refactor Mentionable#notice_added_referencesRobert Speicher2015-07-131-0/+49
|/ | | | | | | It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
* Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets2015-07-131-1/+7
|\ | | | | | | | | | | | | | | Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672
| * Add error message for SSH key linebreaksNikita Verkhovin2015-07-121-1/+7
| |
* | Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-132-0/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admins to disable 2FA for a user > ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png) Depends on !961 See merge request !962