Commit graph

18 commits

Author SHA1 Message Date
Robert Speicher
45fb1f9542 Change login_as uses to gitlab_sign_in 2017-06-19 18:59:01 -05:00
Robert Speicher
a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Douwe Maan
7944254563 Implement diff viewers 2017-06-14 10:12:21 -05:00
Sean McGivern
1d3c33b57e Increase diff limits to 100 KB for collapse and 200 KB overall
This is controlled with the feature flag gitlab_git_diff_size_limit_increase.
Both of these limits were basically picked arbitrarily in the first place;
disabling the feature flag reverts to the old limits.
2017-06-02 19:37:09 +01:00
Oswaldo Ferreira
2338785ec9 Use wait_for_requests to wait all JS request 2017-05-22 20:39:49 -03:00
Rémy Coutable
3855751d02
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'
See merge request !10567

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-24 18:06:47 +02:00
Jacopo
ff76adb547 Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
Robert Speicher
aef345024f Use :empty_project where possible in top-level feature specs 2017-04-20 17:30:55 -04:00
Annabel Dunstone Gray
83e2bfbae0 Fix expand_collapse_diffs specs 2017-02-09 09:00:54 -06:00
Filipa Lacerda
b57027f2a5 Use a new class to keep old behavior 2017-02-08 20:52:08 -06:00
Luke "Jared" Bennett
c1dd08e17b
fixed commit diff linking and added specs 2017-01-14 14:25:37 +00:00
Adam Niedzielski
3fa265d195 Fix expanding a collapsed diff when converting a symlink to a regular file
In this case comparing old_path and new_path is not enough because there
are two entires that match.
2016-11-10 18:24:12 +01:00
Jacob Schatz
964d1bb143 Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master'
Updated diff toggle targets and added icon

## What does this MR do?

Adds the new diff toggle icon and alters the toggle targets.

User can now click on the file header bar _(where no other elements are above it, apart from the icon)_ and the `Click to expand` link to expand the diff and no where else.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-09-02_at_15.35.15](/uploads/c1cb8c0547328153250294d6c95dd96a/Screen_Shot_2016-09-02_at_15.35.15.png)

####  Gif

![2016-09-02_15.34.31](/uploads/abaefaeba9ce8ef129522dae34574c57/2016-09-02_15.34.31.gif)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #21369 

Closes #20326

See merge request !6183
2016-10-01 10:59:32 +00:00
Stan Hu
49b9d8aef9 Fix randomly failing specs in expand_collapse_diff_spec:
```
 Failure/Error: namespace.human_name + ' / ' + name

     ActionView::Template::Error:
       undefined method `+' for nil:NilClass
     # ./app/models/project.rb:807:in `name_with_namespace'
     # ./app/views/layouts/project.html.haml:1:in `_app_views_layouts_project_html_haml___2918737809244135908_70160161538920
'
     # ./app/controllers/projects/commit_controller.rb:23:in `show'
     # ./lib/gitlab/request_profiler/middleware.rb:15:in `call'
     # ./lib/gitlab/middleware/go.rb:16:in `call'
     # ./lib/gitlab/middleware/static.rb:9:in `call'
     # ------------------

     # --- Caused by: ---
     # NoMethodError:
     #   undefined method `+' for nil:NilClass
     #   ./app/models/project.rb:807:in `name_with_namespace'
```

Capybara's `click_link` method doesn't actually wait for the page to reload.
When the `expand_all_diffs` parameter is used, we need to search for unique
elements that appear to ensure that the page has actually reloaded.

Closes #21841
2016-09-03 20:51:18 -07:00
Luke Bennett
40c7ba0129
Updated spec with next click targets 2016-09-03 20:24:31 +01:00
Paco Guzman
a404ab380d Collapsed diffs lines/size don't accumulate to overflow diffs. 2016-07-18 14:43:28 -06:00
Sean McGivern
cdc031b65b Fix expandable diffs 2016-07-12 10:33:21 +01:00
Sean McGivern
93ab686079 Fix feature specs on CI
MySQL's text column isn't big enough for the diffs in the
expand-collapse-diffs branch.
2016-07-11 12:02:13 +01:00
Renamed from spec/features/merge_requests/expand_collapse_diffs_spec.rb (Browse further)