87 Commits
Author SHA1 Message Date
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Phil Hughes a531af64e5 Updated award emoji tests 2016-06-24 09:04:08 +01:00
Phil Hughes 051dc1d263 Fixed failing tests 2016-06-09 17:19:14 +01:00
Alfredo Sumaran d6cecf7add Fix failing tests 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 5a474ff8da Ensure we are clicking a visible dropdown 2016-06-03 17:11:41 -05:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Grzegorz BizonandRobert Speicher e558edd1ce Update specs to carry out changes in note factory 2016-05-29 15:03:00 -04:00
Jacob Schatz 891c94852d Merge branch 'fix-grammar-issues' into 'master'
Fix grammar and wording in text on various pages.

## What does this MR do?

Fixes various grammatical and/or wording issues I found while copyediting on the plane :)

## Why was this MR needed?

Incorrect grammar and weird/confusing wording makes the product look less polished and professional.

See merge request !4237
2016-05-25 19:26:22 +00:00
ZJ van de Weg 6523002267 Remove old tests, and use right factories 2016-05-25 15:43:07 +02:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses
Also removes the note from the development/testing.md guide
2016-05-24 15:40:29 -04:00
Connor Shea 1a85f80b78 Fix grammar and wording in text on various pages. 2016-05-22 10:41:30 -06:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Zeger-Jan van de Weg dccf8a9fc8 Add tests on Awardables and Award Emoji 2016-05-10 12:03:13 +02:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-20 19:18:32 +00:00
Arinde Eniola 5f53ca69ac fix failing tests 2016-04-14 11:16:24 +01:00
Phil Hughes 02cfff4623 Removed references to subscribe-button CSS class
These were being blocked by adblocks

Closes #15043
2016-04-12 13:35:06 +01:00
Arinde Eniola ffe2f8e679 fix the failing tests and some changes 2016-04-06 20:27:30 +01:00
Yorick Peterse 75aaf91cb1 Create SSH keys for SSH clone Spinach tests
These tests would check if the "This project is empty" banner would
contain SSH clone URLs. Oddly enough this should have never passed (as
far as I can tell) as SSH clone URLs in this banner are _only_ displayed
if the current user has at least 1 SSH key attached. Since the tests
never seem to create any they never should have passed, yet somehow they
did. To solve this the Spinach tests in question now ensure at least 1
SSH key is present.
2016-03-21 11:40:13 +01:00
Yorick Peterse fc5ff7af61 Create repositories in Spinach issues tests
Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a
repository in the real world, so let's also create one in our Spinach
tests.
2016-03-19 21:54:08 +01:00
Stan Hu 0901d51724 Improve award emoji test reliability by checking that the emoji is displayed
before the search field is focused
2016-03-17 17:34:15 -07:00
Stan Hu a181722ae4 Improve award emoji test reliability and eliminate sleeps
Closes #14129
2016-03-13 13:39:28 -07:00
Jacob Schatz 6968ea32e2 Merge branch 'award-emoji-design-update' into 'master'
Updated UI of award emoji

Closes #13878 

See merge request !3028
2016-03-11 16:06:18 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master'
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
2016-03-11 13:07:43 +00:00
Phil Hughes a7e76a6119 Updated award emoji tests 2016-03-11 09:02:43 +00:00
Phil Hughes 8d7e0f0ba9 Fixed failing tests 2016-03-10 13:54:54 +00:00
Robert Speicher 56c4f22c80 Remove redundant integration tests
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
2016-03-07 15:33:26 -05:00
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05:00
Phil Hughes f95f242cfa Updated tests 2016-03-04 13:52:29 +00:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master'
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
2016-02-24 02:50:45 +00:00
Annabel Dunstone 476a804969 Update award_emoji test 2016-02-23 19:37:15 -06:00
Phil Hughes 51c17329a4 Fixed failing issues tests
Removed up/down vote icons from merge requests. Was missed from d8069bd858
2016-02-22 11:35:52 +00:00
Annabel Dunstone b80df08735 Add timeout for ajax call in award emoji steps; update focus in award picker 2016-02-19 07:32:20 -06:00
Douglas Barbosa Alexandre 9823d00e0b Add ability to see and sort on vote count from Issues and MR lists 2016-02-17 11:32:02 -02:00
Valery Sizov 719b588998 sporadic spec fix 2016-02-16 15:11:41 +02:00
Rémy Coutable 54613b6af5 Fix the "x of y" displayed at the top of Issuables' sidebar
1. We now display the index of the current issuable among all its project's
issuables, of the same type and with the same state.
2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper
module.
3. Added acceptance specs for the sidebar counter.
2016-02-15 15:40:24 +01:00
Stan Hu 46d35cdbe5 Add spinach tests for award emoji 2016-02-13 02:47:15 -08:00
Phil Hughes 5a04fc9099 Added tests to emoji search field focus 2016-01-29 12:58:34 +00:00
Rubén Dávila 78754cb1c9 Update Issues/MRs updated_at when user leaves comments. 2016-01-18 21:39:23 -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
Rémy Coutable 9d7f88c122 Show referenced MRs & Issues only when the current viewer can access them 2016-01-13 11:59:10 +01:00
Valery Sizov bf03acfa25 spinach fix 2015-12-31 15:59:08 +02:00
Robert Speicher efc679e4aa Fix "I see current user as the first user" step
Why did this break? `¯\_(ツ)_/¯`
2015-12-30 18:22:59 -05:00
Valery Sizov 5605e15914 fix spinach 2015-12-25 14:11:19 +02:00
Valery Sizov 195dc3a746 add sorting of awards 2015-12-25 14:11:19 +02:00
Valery Sizov efe98067da emoji picker search 2015-12-23 13:08:47 +02:00
Valery Sizov bfe905b3ae add some spinach 2015-12-22 23:12:23 +02:00
Valery Sizov 0ae0881250 fix specs 2015-12-22 23:12:23 +02:00
Grzegorz BizonandGrzegorz Bizon 9470d05c70 Add spinach test for note polling
This also increases capybara timeout to 15 seconds (note polling
interval). Capybara will look for new note for this period of time.
2015-12-15 14:19:35 +01:00
Robert Speicher e48391b813 Add custom ColorValidator 2015-12-07 16:57:26 -05:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 12:26:56 +00:00