Commit graph

518 commits

Author SHA1 Message Date
Robert Speicher 60ac6a28a2 Allow current_controller? helper to take an Array of options 2012-09-26 16:32:24 -04:00
Robert Speicher 3ad931ca92 Add current_controller? helper method
Simplifies some of the "active tab" checks we're doing
2012-09-26 16:32:23 -04:00
Robert Speicher f1c6bd8df3 Factories - Format project path and code 2012-09-26 16:32:23 -04:00
Robert Speicher 169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher a1e68a9120 Rename RefExtractor to ExtractsPath
Update docs a bit
2012-09-26 16:32:22 -04:00
Robert Speicher a8ea8d98a4 Update RefExtractor to handle atom feeds 2012-09-26 16:32:22 -04:00
Robert Speicher 576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher 39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher 37f0b600bc Another RefExtractor refactor 2012-09-26 16:32:22 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Robert Speicher e33cbb9b42 Add TreeController and spec 2012-09-26 16:32:21 -04:00
Robert Speicher 884eb73297 Enable tree resource, remove old tree routes 2012-09-26 16:32:21 -04:00
Robert Speicher 567767bcf2 Add ref_extractor helper module for upcoming controllers 2012-09-26 16:32:21 -04:00
Robert Speicher b389247c02 Use Commit#show instead of Commits#show to view a single commit
Commits#show (plural) is going to be for showing commit history on a
specific path.
2012-09-26 16:32:21 -04:00
Robert Speicher bde5088525 Add routing specs for new routes 2012-09-26 16:32:20 -04:00
Nihad Abbasov 83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
Alex Denisov 965b6701ab Comment removed 2012-09-26 17:01:13 +03:00
Alex Denisov c09d233611 Merge branch 'master' into fix_project_access_notification 2012-09-26 16:14:47 +03:00
Marin Jankovski 5928388b1c Protect users projects_limit from mass assignment. 2012-09-26 13:20:44 +02:00
Marin Jankovski 7284c58c5f Don't test if invalid key is valid. 2012-09-25 16:13:24 +02:00
Marin Jankovski 012dc2278c Valid key for deploy keys spec test. 2012-09-25 16:13:13 +02:00
Sytse Sijbrandij f3ce02b5c9 Reject ssh keys that break gitolite.
Failing test.

Working check.
2012-09-24 16:48:10 +02:00
Nihad Abbasov 1bae64d7f6 whitespace 2012-09-21 04:53:13 -07:00
Nihad Abbasov b62445813d API: SSH keys belong to user entity 2012-09-21 04:49:28 -07:00
Nihad Abbasov 4a072be2d7 API: commits belong to project repository 2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets 131553627d Merge pull request #1521 from NARKOZ/api
API for project team members
2012-09-21 04:19:16 -07:00
Nihad Abbasov 25b745271a add API for project team members 2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets 10d3a30b25 APi for commits. Better api docs 2012-09-21 13:22:30 +03:00
randx d12579aa43 Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api 2012-09-20 19:35:45 +03:00
Nihad Abbasov a605943d76 fix broken spec 2012-09-20 22:11:15 +06:00
Nihad Abbasov b08d33f6a9 API: return 401 for invalid session 2012-09-20 08:38:08 -07:00
Dmitriy Zaporozhets 9aafe77e70 I want be able to get token via api. Used for mobile applications 2012-09-20 17:45:07 +03:00
Alex Denisov e6ce47291b master merged 2012-09-20 10:25:29 +03:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04:00
Robert Speicher 01974185a1 Simplify is_within matcher
[ci skip]
2012-09-19 12:14:42 -04:00
Alex Denisov b6c6a5b159 Merge branch 'master' into ssh_keys_api 2012-09-16 22:37:50 +03:00
Robert Speicher f4b14494ef Move project-related routing specs to their own file 2012-09-16 12:42:52 -04:00
Alex Denisov 87d40fd276 Docs added 2012-09-16 18:21:59 +03:00
Alex Denisov c23eb40829 SSH Keys API implemented 2012-09-16 17:52:06 +03:00
Robert Speicher 02b24cefc7 Missed a use of team_project_path 2012-09-16 10:38:01 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
Robert Speicher 83f24de352 Add routing specs 2012-09-16 10:06:21 -04:00
randx a82977c648 A bit of test refactoring 2012-09-15 01:00:59 +03:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Robert Speicher d993f66642 Fix HTML entities being parsed in GFM
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!

Closes #1308
2012-09-13 15:20:00 -04:00
Robert Speicher 0d77209ea0 Be more resilient in the case of missing omniauth settings
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets 3643df1f7c Merge pull request #1411 from miks/project_hooks_api
Project hooks API
2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets 6233fb6b5d Merge pull request #1446 from NARKOZ/refactoring
specs DRY up
2012-09-12 09:08:42 -07:00
Nihad Abbasov b6f249dc1f make API specs more organized and readable 2012-09-12 05:11:56 -07:00
Nihad Abbasov a87c268f7d remove duplicate code from atom request specs 2012-09-12 05:01:50 -07:00
Dmitriy Zaporozhets 048d47e626 Refactorn oauth & ldap 2012-09-12 09:23:16 +03:00
Dmitriy Zaporozhets 40eec08c99 Merge pull request #1409 from riyad/update-votes
Update votes for issues and merge requests
2012-09-11 23:08:19 -07:00
randx d8f6d38d39 Fix observer test 2012-09-12 09:05:12 +03:00
Riyad Preukschas f7c70eaaed Add *votes_in_percent 2012-09-11 16:47:59 +02:00
miks 2e34a6d3c4 Merge branch 'master' into project_hooks_api 2012-09-10 16:47:31 +03:00
Alex Denisov a065557208 Common errors method added 2012-09-10 13:49:00 +03:00
Alex Denisov 77bfc591bf Merge 'master' branch 2012-09-10 09:19:15 +03:00
Alex Denisov 1f240b09ed User left project event added 2012-09-10 00:27:47 +03:00
Alex Denisov a86bd87afc User joined project event added 2012-09-09 23:18:28 +03:00
miks fdb5c82c33 Merge branch 'master' into project_hooks_api 2012-09-08 20:54:58 +03:00
miks 3b5a90bdf6 Projects hooks API implemented 2012-09-08 20:51:12 +03:00
miks 499ff8b441 fix failing tests 2012-09-08 19:39:10 +03:00
miks 0d1009af85 "users" GET test added 2012-09-08 17:51:28 +03:00
miks 8a3408180a move "users" test after project tests 2012-09-08 17:40:36 +03:00
Riyad Preukschas 7b0c7ae52c Add votes_count 2012-09-08 16:05:48 +02:00
Riyad Preukschas 2e0d5c2250 Add downvotes 2012-09-08 16:05:48 +02:00
Riyad Preukschas a2a0060034 Rename Upvote role to Votes 2012-09-08 16:05:48 +02:00
Riyad Preukschas 06c1a8a9ae Make notes recognize downvotes 2012-09-08 16:05:48 +02:00
Valeriy Sizov cc7c6d5396 New project form: spec for autocomplete 2012-09-08 13:35:00 +03:00
miks 4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
Riyad Preukschas ce3fb94939 Fix bug where parsing of emoji was unnecessarily dependent on @project being set 2012-09-08 01:11:44 +02:00
Alex Denisov ed4fbcf6b0 Merge branch 'master' into fix_project_access_notification 2012-09-07 09:39:34 +03:00
Dmitriy Zaporozhets 4f8a4aa44c Merge pull request #1384 from tsigo/emoji
Emoji!
2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets 7c0a1068bf Merge pull request #1363 from AlexDenisov/api_create_project_fixes
API create project fixes
2012-09-06 23:00:04 -07:00
Dmitriy Zaporozhets 79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
Robert Speicher 8f3b1d6ea4 Fix spec broken by bde19c0 2012-09-06 17:05:23 -04:00
miks 909c8c345d Make project users API more RESTful 2012-09-06 23:49:29 +03:00
Robert Speicher 2faa4bba40 Update Note#upvote? to support emoji voting 2012-09-06 15:31:25 -04:00
Robert Speicher 8808c5fa8d Merge branch 'master' into emoji 2012-09-06 15:23:42 -04:00
Dmitriy Zaporozhets a595f8944a Merge pull request #1392 from NARKOZ/refactoring
refactor factory specs
2012-09-06 08:11:41 -07:00
Nihad Abbasov d861023cb9 refactor factory specs 2012-09-06 07:52:01 -07:00
Alex Denisov 562af7a6a2 Merge branch 'master' into normalize_capitalization 2012-09-06 11:40:56 +03:00
Alex Denisov a65ce74843 Spec fixed 2012-09-06 11:40:16 +03:00
miks ab057bb5db proper Grape params hash simulation 2012-09-06 10:20:59 +03:00
miks cd846ba2b5 Fix tests 2012-09-06 09:52:27 +03:00
miks 94c5054566 count against last project 2012-09-06 01:06:02 +03:00
Robert Speicher b3bbf53e9b Set the size of emoji to be 20x20
Forgot they were so big!
2012-09-05 16:14:54 -04:00
Robert Speicher 880a233e6d Add specs for parsing Emoji 2012-09-05 16:05:20 -04:00
miks 8f7360f390 API on adding users to project implemented 2012-09-05 23:01:03 +03:00
Nihad Abbasov 0b559cdece add validations for boolean attributes 2012-09-05 04:01:11 -07:00
Robert Speicher 861a51488a Add specs for a couple more Repository methods used by discover_default_branch 2012-09-05 01:02:30 -04:00
Robert Speicher 36738897bf Add specs for Project#discover_default_branch 2012-09-05 00:54:00 -04:00
Robert Speicher a463353773 Add "empty_repo?" method to Repository role
Replaces two calls that this method simplifies
2012-09-04 12:05:21 -04:00
Alex Denisov 4bd3024580 json_spec removed 2012-09-04 10:29:26 +03:00
Alex Denisov b73d4419ea json_spec added. Create project via REST API fixed 2012-09-04 09:38:48 +03:00
Robert Speicher d29827433d Update User#identifier to conform to Gitolite 2.x's user pattern
Also modifies the specs a bit because I can't help myself.

Closes #480
2012-09-04 00:20:17 -04:00
Alex Denisov af63607a5c test_after_commit gem added 2012-09-03 21:46:17 +03:00
Alex Denisov 1f1c8094fe After commit instead of after_update 2012-09-03 20:48:38 +03:00
Alex Denisov e078a173d6 Create project via API: fixes added 2012-09-03 18:00:24 +03:00
Dmitriy Zaporozhets cc03600b22 Merge pull request #1347 from AlexDenisov/api_project_creation
API for new project creation
2012-09-03 01:48:51 -07:00
Robert Speicher ef24576fc2 Redesign gfm helper specs
Should now be much clearer about what each spec is actually testing.
For example, instead of testing stuff like link classes and titles in
every single call, we only test those things once, in their own specs.
2012-09-02 13:40:14 -04:00
Robert Speicher 877aa54586 Rename gitlab_flavored_markdown_spec to gitlab_markdown_helper_spec 2012-09-02 02:45:18 -04:00
Alex Denisov 2bd1682ab4 Merge branch 'master' into api_project_creation 2012-08-31 11:26:12 +03:00
Dmitriy Zaporozhets ed954ebae2 Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications
Issue status changed notifications
2012-08-31 00:51:31 -07:00
Alex Denisov c1173e2707 API on Projects creation implemented 2012-08-31 10:15:37 +03:00
randx d246a68a24 fix project.last_activity spec 2012-08-30 19:45:05 +03:00
Dmitriy Zaporozhets 35fbc4d3bb Merge pull request #1334 from tsigo/milestone_api_specs
Fix milestone API specs
2012-08-29 09:02:07 -07:00
Dmitriy Zaporozhets 5b0a998920 Merge pull request #1333 from tsigo/model_specs
Increased model spec coverage
2012-08-29 09:00:02 -07:00
Robert Speicher dde8ed4455 Fix milestone API specs and moved to requests/api
Closes #1331
2012-08-29 11:58:33 -04:00
Robert Speicher 97423a0bed Add more coverage for model validations and associations 2012-08-29 11:36:02 -04:00
Dmitriy Zaporozhets 8c44789e6f Mark api milestone specs as pending 2012-08-29 18:09:41 +03:00
Robert Speicher 2bdea8651f Add is_within method for shoulda's EnsureLengthOf matcher 2012-08-29 10:44:34 -04:00
Robert Speicher 9e7d77cece Remove annotations from specs 2012-08-29 10:44:34 -04:00
Robert Speicher 9d4d40deed Move IssueCommonality and Upvote specs out of models and into their own specs 2012-08-29 10:44:34 -04:00
Robert Speicher 14daf2e2ba Add include_module matcher 2012-08-29 10:44:34 -04:00
Robert Speicher 2c95074a5f Remove model specs that are covered by factories_spec 2012-08-29 10:44:34 -04:00
Alex Denisov 2703fe3e72 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:42:15 +03:00
Alex Denisov 05af5655a7 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:21:14 +03:00
Alex Denisov 2cb0a62f7d Notification sends to issue author and assignee if issue being reopened or closed 2012-08-29 10:48:17 +03:00
Alex Denisov 4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00
Robert Speicher 1dda08486b Only include StubbedRepository in Project model 2012-08-29 01:55:41 -04:00
Dmitriy Zaporozhets 14f5d1727a Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api
Conflicts:
	spec/requests/api/issues_spec.rb
2012-08-29 15:35:12 +03:00
Dmitriy Zaporozhets adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets 5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
Robert Speicher 39ff033d1a Remove pkey.example 2012-08-28 21:22:49 -04:00
Robert Speicher a3a63eeb92 Remove all instances to 'gitlabhq_x' seed repositories from specs and features
We now need only one seed repo! Also cleans up the seeding script.
2012-08-28 21:22:49 -04:00
Robert Speicher a39cfb5461 Simplify StubbedRepository after GitHost changes from master 2012-08-28 21:22:49 -04:00
Robert Speicher 77d06454ed Simple model spec changes made possible by new factories 2012-08-28 21:22:49 -04:00
Robert Speicher 0bc9094058 Add deploy_key and personal_key factories 2012-08-28 21:22:49 -04:00
Robert Speicher c9c1f76e00 All specs and features currently passing with FactoryGirl 2012-08-28 21:22:49 -04:00
Robert Speicher 4805c64f2a Remove spec/factory and spec/factories 2012-08-28 20:30:50 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup
Use GitHub::Markup to parse markup files
2012-09-09 03:34:50 -07:00
miks ba584c7d8d Merge branch 'master' into project_users_api 2012-09-08 20:55:08 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files
Closes #1382
2012-09-05 16:52:49 -04:00
randx 7cdc5b9e04 Use similar interface to access gitolite
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
2012-08-29 00:04:06 +03:00
Alex Denisov 3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec
Back-ported from my still-in-progress major cleanup.
2012-08-25 14:19:16 -04:00
Robert Speicher 232389f4e8 Clean up request specs 2012-08-25 14:19:15 -04:00
Robert Speicher b2a5344a2d Add a simple api method to ApiHelpers, replacing api_prefix
See docs for usage
2012-08-25 14:19:15 -04:00
Robert Speicher fba174e9bc Cleanup spec/support folder and spec/spec_helper
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
2012-08-25 14:19:15 -04:00
Robert Speicher 852b9c28dd Move observer specs out of spec/models into spec/observers 2012-08-25 13:22:45 -04:00
randx 14bd9c9228 Fix dashboard issues atom feed rspec 2012-08-24 12:17:05 +03:00
Robert Speicher b838440f15 Deprecate the DELETE method for Issues API
Now returns HTTP Status 405 - http://httpstatus.es/405

Closes #1245
Closes #1264
2012-08-22 13:26:09 -04:00
Robert Speicher 0f1ca8b3e7 Remove DELETE API for Milestones 2012-08-22 13:19:55 -04:00
Robert Speicher db4c3e58bc Don't run SimpleCov on Travis 2012-08-23 07:24:25 -04:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
randx 3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx 64f3682feb project should not respond to write_hooks any more 2012-08-21 20:24:04 +03:00
Robert Speicher 652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00