nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15857 commits 4 branches 0 tags 121 MiB
Commit graph

851 commits

Author SHA1 Message Date
Jonne Haß
fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more 
Conflicts:
	Changelog.md
 2013-04-13 12:53:31 +02:00
Juan Manuel Azambuja
5a85fd71f1 close issues #4017 and 4107 by including jquery.textchange 2013-04-09 16:21:19 -03:00
movilla
bc87b501f2 Fix show more post in my activity mobile page. Close #4108 2013-04-08 00:04:42 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq 
Sidekiq (+ some cleanup)
 2013-04-03 15:19:15 -07:00
Steffen van Bergerem
a693a0970b added hotkeys to navigate in stream 2013-04-02 19:24:20 +02:00
movilla
b257939f7e Add multiphoto for mobile post 2013-03-30 10:59:06 +01:00
Marcelo Casiraghi
b0f76f1764 Fix confirmation at getting_started page 2013-03-25 23:09:38 -03:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Jonne Haß
3fc3b249e7 End the require mess 
* Rename and reorganize post fetcher to fix autoloading, also let it use
  Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
 2013-03-21 23:37:53 +01:00
movilla
3990bebcf4 Fix mobile view of deleted reshares 2013-03-18 16:52:37 +01:00
Jonne Haß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01:00
Jonne Haß
8f6ae75423 Merge pull request #4039 from marpo60/diaspora_with_sprites 
Add Sprites to Diaspora!
 2013-03-15 09:44:27 -07:00
Fabián Rodríguez
0a3e242e79 fix reshares in single post-view 2013-03-11 22:45:25 -03:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
movilla
7a8269ebf3 * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 
* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.
 2013-03-10 15:02:18 +01:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
movilla
e0d0d0f668 Fixed removing images from publisher on the profile and tags pages 2013-02-21 22:19:24 +01:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Jonne Haß
baadb49ebf Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice 
Issue #3672: Reshare alert box is appearing twice
 2013-01-31 11:13:13 -08:00
Jonne Haß
ff10ffe43c update feature to match overriden translation 2013-01-31 19:31:38 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Asphyxia
c0dd888e61 Issue #3832: Logged-out users stream options 2013-01-18 15:10:13 -03:00
Fabián Rodríguez
68e39e0393 fix specs 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
David McMullin
f290bcf169 add tests so it doesn't break again 2012-11-25 17:38:19 +00:00
Jonne Haß
e25ebe2098 lets see if this fixes anything about the randomly failing comments cuke, still no clue about the recent timeouts 2012-11-22 21:14:26 +01:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Florian Staudacher
452de1b866 fix remaining cukes and some cleanup 2012-09-17 20:35:38 +02:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Jonne Haß
7ec2f8f419 finish beta striping 
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
 2012-09-12 07:51:19 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
movilla
a564cbff9d New_login_mobile_web_ 2012-09-08 15:30:59 +02:00
Devendra
8325882ea2 Changing cucumber steps to use tabular form where possible 2012-08-22 23:22:10 +05:30
Devendra
94fadaebcb Changing all statements of form "I fill in " to tabular form, helps when there are multiple such statements consecutively. Changed single statements also for clarity and uniformity 2012-08-21 16:41:06 +05:30
Devendra
7b9fcc2b3d merging multiple consecutive "I (should|should not) see" lines into one 2012-08-17 15:37:28 +05:30
Devendra
3d21e89b3b Adding step definitions to facilitate merging of multiple consecutive "I (should|should not) see " clauses on single statement, adding one example as well 2012-08-09 16:00:39 +05:30
Devendra
7c4c11f8d6 Refactored cucumber features, steps, and support helpers for change password feature 2012-08-07 21:23:20 +05:30
Florian Staudacher
038599bf8f update jquery.mentionsInput to latest version 
+ make some tests a little nicer
 2012-07-10 20:37:57 +02:00
Zach Scott
82a47d0ba3 Fixed Issue #3382 - The comments under postings are missing when using the #tags -view 2012-06-18 22:46:01 -06:00
Florian Staudacher
994bfd4a24 fix client-side validations in registration form + test 2012-06-18 18:57:44 +02:00
Florian Staudacher
b184415c19 cleanup session cukes 2012-06-15 19:30:08 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Maxwell Salzberg
1bcaa5a4bf fix cuke, as canvas-frame is now stream-frame 2012-05-22 22:54:22 -07:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
Dennis Collinson
fe0156a18b cuking out new stream, refactors. 2012-05-21 15:14:23 -07:00
Florian Staudacher
9c2c135731 I made a boo boo 2012-05-20 23:09:40 +02:00
Florian Staudacher
67dd49b1e4 ... wait for it ... 2012-05-20 22:44:50 +02:00
Florian Staudacher
9b563e39da fix login cukes 2012-05-19 22:29:12 +02:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
danielgrippi
62ba75ad1b DG DC; Move stuff to second page of framer 2012-05-17 19:02:58 -07:00
Steven Hancock
2ae366ad19 Render invitation email without a layout 
Ideally, we'll probably want to add a layout for this email at some point,
but this simplifies it to the bare minimum and gets rid of the "click here
to change your notification settings" link.

fixes #3270
 2012-05-17 17:51:20 -07:00
danielgrippi
27aff7fb1e DG DC; GREEEEEEEEEN 2012-05-17 17:01:31 -07:00
Dennis Collinson
c66bd9d6d8 fix posting with services, fix cuke 2012-05-17 15:32:35 -07:00
Dennis Collinson
00f1adc8b2 Going back to the composer from the framer is happy via button 2012-05-17 15:32:35 -07:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :( 
This reverts commit c52342b7cb.
 2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
Maxwell Salzberg
9af48d85aa be less strict in asserting post template as not all small frames are .post(which seems weird) 2012-05-14 19:00:25 -07:00
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
Dennis Collinson
ec8625746e add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang 2012-05-12 18:08:45 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
Florian Staudacher
9f586e915f well, then let's try the other thing that is suggested on that page to fix cukes 2012-05-10 22:09:31 +02:00
Florian Staudacher
e0e8b47cb4 see, if this fixes those nasty cuke timeouts 2012-05-10 13:57:26 +02:00
Florian Staudacher
4fdb6bd9b7 use post cuke step instead of old skool steps 2012-05-10 00:16:50 +02:00
danielgrippi
5d92d2464b fix email spec; nokogiri needs a top-leve element 2012-05-08 18:21:38 -07:00
Steven Hancock
605b418d42 Reshares delegate nsfw to the root post 
fixes #3120
 2012-05-08 03:20:01 -07:00
Maxwell Salzberg
ddb7c2c9b0 gah attempt tp fix some stupid tests :/ 2012-05-07 23:20:56 -07:00
Maxwell Salzberg
f7205bdf18 sad panda. selenium web driver had to update, and clearly some of the behavior around send_key changed :( 2012-05-07 19:55:42 -07:00
Maxwell Salzberg
4c7e82fec9 derp; find always returns the first element in capybara 2012-05-07 18:56:30 -07:00
Maxwell Salzberg
fcd67ebc77 fix build 2012-05-07 15:55:34 -07:00
danielgrippi
c31413e73c green build = happy dan 2012-05-07 14:30:30 -07:00
Maxwell Salzberg
fa1897112b fix some tests 2012-05-03 20:07:56 -07:00
Florian Staudacher
979eb66e44 added tests for flash messages on reshares 2012-04-27 19:23:30 +02:00
Dennis Collinson
512347cad9 get crunk 2012-04-25 17:02:01 -07:00
Florian Staudacher
c4ccf71dab added debugging cuke steps [ci skip] 2012-04-24 23:11:10 +02:00
Florian Staudacher
390246dde1 temporarily "fix" the evil cuke of inconsistent death 2012-04-24 23:11:10 +02:00
Dennis Collinson
40c04234bd navigate to experimental profile on successful post 2012-04-23 18:08:02 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
Dennis Collinson
d0b7833dba cucumber does not like comments in the Feature section 2012-04-19 16:01:36 -07:00
Dennis Collinson
1938c75478 comment out chubbies till it's a focus. 2012-04-19 15:40:21 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Dennis Collinson
d767410e6d mentions are clickable in framer 2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -07:00
danielgrippi
a1d4ca9bec Refactor composer and framer to user same layout 
composer touchup; added controls to the bottom; centered input area; removed forms.Base view

Fix tests
 2012-04-10 11:38:35 -07:00
Maxwell Salzberg
62c3a3b350 double wait time to see if travis responds to that, as its not even getting to the ording issue at this point 2012-04-10 11:08:14 -07:00
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Jonne Haß
79acc2c4cf This doesn't work altogether, fix it yourself [ci skip] 
Revert "ensure that time is always far beyond last post creation"

This reverts commit 749b403d13.

Revert "make Timecop travel persistent for the whole run"

This reverts commit 5d9bdd80ab.

Revert "Timecop post creation for cucumber"

This reverts commit dba3dbbfeb.
 2012-04-10 12:56:25 +02:00
Jonne Haß
749b403d13 ensure that time is always far beyond last post creation 
oh yeah Timecop is really the best solution... hmpf
 2012-04-10 12:32:17 +02:00
Jonne Haß
5d9bdd80ab make Timecop travel persistent for the whole run 
So now we're getting dirty, this wouldn't be necessary with my solution...
 2012-04-10 11:54:06 +02:00
Jonne Haß
dba3dbbfeb Timecop post creation for cucumber 2012-04-09 22:05:22 +02:00
Maxwell Salzberg
e1d86bddcf some tweaks so it fails gracefully on systems that do not have free command 2012-04-05 14:29:41 -07:00
Maxwell Salzberg
21667768aa cucumber should not fail with pending steps :( 2012-04-05 12:49:56 -07:00
Maxwell Salzberg
20fee66eee dont do speedup magic on travis 2012-04-05 12:28:07 -07:00
Maxwell Salzberg
a36d5558db use merge not merge! so we dont create false user objects 2012-04-05 11:42:32 -07:00
Florian Staudacher
90387e83f8 speed up cukes by deferring GC 
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

this speeds up tests from 9min 47sec to 9min 16sec on my machine
(6% improvement)
 2012-04-05 16:01:58 +02:00
Maxwell Salzberg
d53b7b5f9a fix trumpeter spec 2012-04-04 23:05:41 -07:00
danielgrippi
169fc743d5 update feature to pending outdated assertion 2012-04-04 19:20:00 -07:00
Maxwell Salzberg
875ec11afc Merge pull request #3105 from Raven24/evil-comment-cuke 
refactored show-page comment cuke to be like normal comment cuke
 2012-04-04 12:01:19 -07:00
Maxwell Salzberg
f36e081a04 mark the trumpter mentioning spec wip so travis rake cucumber returns the right response code if it is green 2012-04-04 10:41:13 -07:00
Florian Staudacher
118ae2d657 refactored show-page comment cuke to be like normal comment cuke 2012-04-04 15:23:39 +02:00
Maxwell Salzberg
78146a95d9 try a much longer wait time and see if that makes things pass on travis :*( 2012-04-03 23:03:11 -07:00
Maxwell Salzberg
cf3776fde2 remove webmock from cucumber to try and fix the travis timeout errors :( 2012-04-03 22:16:51 -07:00
Maxwell Salzberg
ef74a06d85 reduce timeout to maybe get cukes to pass 2012-04-03 18:04:08 -07:00
Maxwell Salzberg
0986e412de well that didnt work... Revert "try reconnecting after every cuke for postgres only to try and deal with travis issues" 
This reverts commit 1604aedf03.
 2012-04-03 17:59:51 -07:00
Maxwell Salzberg
1604aedf03 try reconnecting after every cuke for postgres only to try and deal with travis issues 2012-04-03 17:27:28 -07:00
danielgrippi
5459d07339 bump capybara timeout to avoid timeout errorsdefine cucumber step to be pending so travis doesn't freak out 2012-04-03 16:43:44 -07:00
danielgrippi
3bc3f13651 upgrade backbone, fix tests 
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
 2012-04-03 16:31:52 -07:00
Florian Staudacher
c9fa88a1de fix cuke unhappiness I introduced with #3088 2012-04-03 01:13:44 +02:00
Maxwell Salzberg
adf85e1ec6 adding a bit to tubbo's spork branch 2012-03-31 01:22:46 -04:00
Maxwell Salzberg
8e0998ab88 make cukes' wait until use block form, as we were getting some weird parse errors otherwise 2012-03-31 00:15:55 -04:00
Dennis Collinson
59f7f504e8 Wallpaper Mood 2012-03-29 15:14:09 -07:00
Dennis Collinson
6488cd004b Disable Mentions in trumpeter to fix cukechange assertion of mood 2012-03-29 12:16:59 -07:00
Dennis Collinson
34bdc09763 simplify env.rb for great justicethe jquery hack was messing up cukes, killed that 2012-03-29 11:51:32 -07:00
Maxwell Salzberg
402694e516 fixing cukes 2012-03-28 14:47:28 -07:00
Steven Hancock
1aa0b15c8c Move Javascript to the asset pipeline 
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
  everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
  from .handlebars to .jst.hbs (this is to keep them in the same
  global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
  be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
  wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
  that were compiled by Jammit in the Rails 3.0 code
 2012-03-27 18:07:44 -07:00
danielgrippi
f72f1d4059 more progress 2012-03-27 18:07:22 -07:00
Dennis Collinson
9550082a94 fix notification cuke 2012-03-27 16:07:42 -07:00
Dennis Collinson
6288eff599 day mood for a post responds to content 
extract creating a post with templates to a static post view method.

Legacy templates extracted, day view

day mood shows photos and has variable text size
 2012-03-27 14:54:27 -07:00
Dennis Collinson
11eb1eb7d8 MS DC fix tests 2012-03-27 14:52:53 -07:00
Dennis Collinson
8c640b179e showing photos in framer 2012-03-27 14:52:52 -07:00
Dennis Collinson
93e64c43aa MS DC test for note template 2012-03-27 14:52:52 -07:00
Dennis Collinson
5d5fa084e5 next cuke, fix old 2012-03-27 14:52:52 -07:00
Dennis Collinson
358414371e MS DC framer shows rudimentary version of post 2012-03-27 14:52:52 -07:00
Dennis Collinson
7ec1ef87c2 MS DC Post framer process init 2012-03-27 14:52:52 -07:00
Dennis Collinson
a14090965f pening sad spec 2012-03-27 14:52:52 -07:00
Dennis Collinson
a0e6433f5a test multiple file upload in cucumber 2012-03-27 14:52:51 -07:00
Dennis Collinson
60420f1061 DG DC form autosubmits on file field change 2012-03-27 14:52:51 -07:00
Dennis Collinson
426f0278f9 DG DC uploading a photo shows up in the stream 2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246 MS DG; mentions work in new publisher 2012-03-27 14:52:50 -07:00
Dennis Collinson
e77d7608cd DC DGtoggle between public an private 2012-03-27 14:52:50 -07:00
Dennis Collinson
cc04f492f2 MS DC added aspect presenter, and include the data on the user 2012-03-27 14:51:40 -07:00
Dennis Collinson
bf4dabc4f4 MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
danielgrippi
def5b81fbf MS DG; fix cukes and stuff 2012-03-21 13:50:25 -07:00
Maxwell Salzberg
2e1f353ac4 Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more 
Conflicts:
	public/javascripts/app/views/content_view.js
 2012-03-19 19:11:57 -07:00
danielgrippi
852687b31c MS DG fix a few final tests 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
11505a386c adding a test for decremented invites, as, and check the invite is valid in the controller 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works, 
and improving admin functionality
 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Florian Staudacher
27997e9525 refactored test method into helpers 2012-03-16 22:25:53 +01:00
Florian Staudacher
5dae27c170 finally some working tests for "show more" 2012-03-16 02:00:50 +01:00
Maxwell Salzberg
2d3df3e374 two cukes failed because the local files were changed? 2012-03-14 18:44:10 -07:00
Florian Staudacher
98d1e29055 extracted oembed thumb stuff from #2941, also fixes oembed cukes 2012-03-05 00:44:08 +01:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
Dennis Collinson
8d2376b3bf just sleep 2012-02-23 12:53:05 -08:00
danielgrippi
37981b71fe MS; DG; adding cucumbers for post templates 2012-02-21 17:31:26 -08:00
danielgrippi
d54ff5f341 MS; DG added test for unauthenticated post viewing 2012-02-21 15:23:08 -08:00
Maxwell Salzberg
4aa86750b9 added a failing feature for dmorleys fix 2012-02-18 16:00:07 -08:00
Maxwell Salzberg
20c79f1bb2 add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing 2012-02-16 17:37:13 -08:00
Maxwell Salzberg
dcc2bcd233 remove pending spec, which was pending because we dont use that feature anymore 2012-02-16 17:37:13 -08:00
Maxwell Salzberg
40413a6bc3 make the step pending so travis doesnt say we are failing :/ 2012-02-16 13:17:37 -08:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
44e072c330 DC DG; a participation is created in StatusMessageController 2012-02-10 16:42:21 -08:00
Maxwell Salzberg
1c314c9540 return to diaspora after oauth cukes to prevent failures [ci skip] 2012-02-09 18:52:57 -08:00
danielgrippi
5a4f9d5b99 fix cuke 2012-02-09 18:03:41 -08:00
Maxwell Salzberg
62b222020d allow localhost in cukes 2012-02-09 17:54:56 -08:00
Maxwell Salzberg
7109cf6c67 mock out slow things that our tests dont need for speed 2012-02-09 17:44:32 -08:00
danielgrippi
e6e49bbf1f stubbornella media and img dom structure FTW! major css deletion <3 2012-02-09 14:29:01 -08:00
Maxwell Salzberg
ceb0a15a84 update participate path in cuke 2012-02-09 10:52:53 -08:00
Dennis Collinson
74409d64b5 cleanup, yoq 2012-02-08 17:25:25 -08:00
Dennis Collinson
94a7f5bb91 unsfw - sorry Kinky Joe! 2012-02-08 16:35:55 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Dennis Collinson
8ae18bb393 nsfw's users posts are now nsfw 2012-02-07 19:14:44 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Dennis Collinson
a399572995 MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things 2012-02-06 16:51:32 -08:00
Dennis Collinson
578e8ef269 broken 2012-02-06 14:55:14 -08:00
Maxwell Salzberg
4382d45e82 almost failing cuke 2012-02-06 12:25:02 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
danielgrippi
ebab307b3d fix require in cucumber 2012-02-01 16:47:32 -08:00
Maxwell Salzberg
c7d422c338 fix cukes 2012-02-01 15:12:18 -08:00
Sarah Mei
0bb6ff99c9 Fix commenting in notification feature 2012-01-27 19:56:40 -08:00
Sarah Mei
1a30ef62a6 Fix comment feature 2012-01-27 19:21:27 -08:00
Dennis Collinson
18cd151456 cuke fix 2012-01-23 19:32:15 -08:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
Maxwell Salzberg
30947778f9 remove stray api feature 2012-01-17 17:33:55 -08:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
2cbfe75686 make this spec WIP, as there is a larger problem with hidden posts that is addressed in teh hidden posts branch that is soon to be merged in 2012-01-13 13:34:32 -08:00
danielgrippi
36e13893a3 fix closes account feature 2012-01-07 14:57:44 -08:00
danielgrippi
c3ea1dfc6e DC DG fix search cucumber step 2012-01-07 14:24:27 -08:00
danielgrippi
3db0cd3776 fix all cukes but the tags feature [ci skip] 2012-01-07 14:24:27 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
Dennis Collinson
7ccc81b0a4 fix conversations cuke 2012-01-07 14:23:28 -08:00
danielgrippi
5e28c8f6ec fix backing out of photo-only post cuke 2012-01-07 14:23:27 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
71bae10317 fixed notification specs; removed a cuke around reshares already tested in jasmine 2012-01-07 14:23:27 -08:00
danielgrippi
f804db36b8 DG DH; fix most of the cukes (7 failures left) 2012-01-07 14:23:26 -08:00
danielgrippi
bc0c92ec64 added inf. scroll to stream; passing inf. scroll cukes 2012-01-07 14:23:26 -08:00
danielgrippi
565a0b21f7 fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off) 2012-01-07 14:23:26 -08:00
danielgrippi
bbc7db3152 fixed follows_tags.feature 2012-01-07 14:23:26 -08:00
danielgrippi
52183b8cc4 fix name in header; 27 failures 2012-01-07 14:23:25 -08:00
danielgrippi
039df8f879 fixed 14 cukes (all comments features) 2012-01-07 14:23:25 -08:00
Maxwell Salzberg
a1b389c365 SM MS; stub jquery in cukes, cleanup env.rb 2012-01-07 13:07:45 -08:00
danielgrippi
f395a707ea destroy cookies instead of visiting a controller action for signing out (thx sarahmei) 2012-01-06 23:28:23 -08:00
danielgrippi
2dd0012d1e update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc) 2012-01-06 22:33:55 -08:00
danielgrippi
2e3b8f9d53 speed up cucumber 2012-01-05 22:41:05 -08:00
danielgrippi
aac97303ce removed duplicate line in a feature [ci skip] 2011-12-20 12:59:15 -08:00
danielgrippi
4ae0dcec43 fix notifications cucumber features 2011-12-20 12:30:29 -08:00
Sarah Mei
3c8b26b051 refactor infinite scroll features to take less time 2011-12-11 17:14:23 -08:00
Sarah Mei
78f4758d6d Collapsing some cucumber features to save time. Removing features that should be tested elsewhere in the stack. 2011-12-11 15:08:43 -08:00
Jonne Hass
5726b37fb9 diaspora connect: fix edge case where pod lost the client information 2011-12-11 01:37:15 +01:00
Jonne Hass
559016af7e oh well, touching Capybara.app_host resets the session 2011-12-10 20:53:19 +01:00
Jonne Hass
8f13f2182e ensure the expected port is actually used by cucumber 2011-12-10 12:54:39 +01:00
Jonne Hass
8b141ed5d5 oauth feature green, except for the pod forgot client edge case 2011-12-10 12:54:39 +01:00
Maxwell Salzberg
af7962e2e8 fix photo feature 2011-12-09 13:52:32 -08:00
danielgrippi
342593988b MS DG; fixed close account cukes 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
455e5375d8 add 1.9.3 to travis. remove deprecation warning from cukes 2011-12-08 16:30:58 -08:00
danielgrippi
f4c9b548f9 update cucumber and capybara. one failing cuke. 2011-12-07 18:40:39 -08:00
danielgrippi
f40ed9bb25 DG MS; remove deprication warning in cukes 2011-12-07 17:32:09 -08:00
Daniel Grippi
083bb8fbbf remove patch for db cleaner (version bump seemed to resolve it) 2011-12-05 23:50:50 -08:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
Gonzalo Rodriguez
77d30949a0 Refactor some cucumber steps 2011-12-03 23:09:51 -02:00
Sarah Mei
a594d8f7ce Fix cucumber log in and close account feature 2011-11-25 04:48:47 -08:00
Sarah Mei
81476b79ca The home page is now /stream 2011-11-25 03:54:47 -08:00
Gonzalo Rodriguez
0de6512789 Decrease cukes default wait time 
This will not fix cukes, but at least travis is going
to throw failures output instead of timing out
 2011-11-22 00:18:14 -02:00
Manuel Schölling
335a7b4ebe Modified session steps to work with /public/index.html 2011-11-16 20:25:54 +01:00
pivotalcommon
52aaf33296 Merge pull request #2402 from 21echoes/cuke_path_fix 
minor error in features/paths.rb regarding the recent split of posts and photos
 2011-11-14 17:43:19 -08:00
David Kettler
79da38d929 now that photos are not posts, we gotta send posts to the post path in cucumber tests 2011-11-14 17:14:10 -08:00
Sarah Mei & Tim Frazer
ebad0f5ec3 Don't try to follow diasporahq during cucumber tests 2011-11-14 16:55:59 -08:00
Pistos
d87c0a9b44 Don't assume specific translation for aspects title. 2011-11-10 11:20:31 -05:00
Pistos
3e689ec988 Whitespace cleanup. 2011-11-10 11:20:24 -05:00
Jonne Hass
919b010e06 fix step definition 2011-11-10 15:05:32 +01:00
Jonne Hass
188f429998 Merge branch 'issue1924-cucumber-tests' of https://github.com/Gonzih/diaspora 
Conflicts:
	features/posts_from_main_page.feature
	features/step_definitions/custom_web_steps.rb
 2011-11-10 14:45:00 +01:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Sarah Mei
ac065e1706 Differentiate between oauth features and non-oauth features for travis. 2011-11-05 21:09:56 -07:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
danielgrippi
0ab23f337a fixed all cukes; view bugs on streams 2011-11-03 12:31:24 -07:00
danielgrippi
1ac5c7af62 fixed some cukes 2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
0eb33b371b blocked users works for multi stream, cuke passes 
fixed scoping stuff
 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
danielgrippi
68a8c23d80 fix all but one cuke 2011-10-27 22:41:49 -07:00
Pistos
0a1e649b2b Convert some reshare-related Cucumber features into specs. Introduce SpecDoc. 2011-10-27 23:27:14 -04:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
Ilya Zhitomirskiy
c6a17cc00b updated cucumber steps 2011-10-24 14:11:34 -07:00
danielgrippi
18690f2b44 all cukes green; spelling error, whoops 2011-10-23 19:07:32 -07:00
danielgrippi
93c70f0649 one cuke failing in changes_password.feature 2011-10-23 19:05:31 -07:00