Commit graph

17 commits

Author SHA1 Message Date
Douwe Maan
fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Fatih Acet
8968171c9e Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'
Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form

Closes #32447 and #32907

See merge request !11558
2017-05-26 19:42:02 +00:00
Bryce Johnson
ff5044d8e9 Update spinach specs to explicitly check Remove Source Branch. 2017-05-23 12:08:50 -04:00
Oswaldo Ferreira
2338785ec9 Use wait_for_requests to wait all JS request 2017-05-22 20:39:49 -03:00
Fatih Acet
0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Robert Speicher
40ba2f7d20 Except where necessary, use sign_in over login_as in features 2017-04-19 18:55:36 -04:00
Douwe Maan
ae65817b92 Actually include WaitForAjax! 2017-04-07 16:59:34 -05:00
Douwe Maan
41f79250b2 Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run 2017-04-07 15:58:56 -05:00
Jose Ivan Vargas Lopez
c380d7669c Fixed button capitalisation for Projects in views 2017-04-06 14:58:57 -05:00
Robert Speicher
c1743ba4c4 Use a project factory with a repository where necessary 2017-01-25 14:52:12 -05:00
Robert Speicher
822bf2f91c Add the :repository trait to :project factories in Cucumber steps 2017-01-17 16:02:08 -05:00
Robert Speicher
de944c914b Add traits for each access_level to ProjectMember factory 2016-03-06 16:53:22 -05:00
Rubén Dávila
87b076f2ce Add some spinach specs 2016-02-19 13:14:55 -05:00
Rémy Coutable
5e452d3794 Improve & adds specs for Issue/MR references
- Improve specs for private Issue/MR referenced in public Issue
- Add specs for private Issue/MR referenced in public MR
2016-01-13 17:05:54 +01:00
Rubén Dávila
42da7cd375 Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189 2015-12-21 22:59:15 -05:00
Dmitriy Zaporozhets
74d73bd953
Fix random failing test
Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 20:09:30 +01:00
Rubén Dávila
aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00