Commit graph

238 commits

Author SHA1 Message Date
Jonne Haß
24d9be2e68 Merge branch 'stable' into develop 2015-08-27 21:03:16 +02:00
augier
2ce7a1e185 Mobile subdomain
closes #6354
2015-08-27 21:01:36 +02:00
Dennis Schubert
6b863defa3 Merge branch 'stable' into develop 2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e Remove unused js code (stream widget and dropdowns)
closes #6279
2015-08-25 04:26:17 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +02:00
Benjamin Neff
97f973b80a fix rubocop warnings in poor_mans_webmock.rb
and remove unused HttpPost mock
2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
Steffen van Bergerem
d6d1e38ba1 Stabilize mobile close account cukes 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Augier
207b6c6153 Port to Bootstrap 3
correcting images display on stream sidebar

Corrections on profile page
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Jonne Haß
ea58c95fa0 Switch back to database cleaner
database_rewinder seems to cause deadlocks in postgres and other
subtle bugs for us.
2015-03-25 13:37:56 +01:00
Jonne Haß
65a738e604 bump rspec-rails 2015-03-25 02:33:56 +01:00
goobertron
2b6ca180ce Add tests for liking and unliking posts 2015-03-14 14:50:35 +00:00
Jonne Haß
0f2d2bd44d Replace DatabaseCleaner with DatabaseRewinder 2015-03-02 15:02:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Jonne Haß
8fd39d67f0 Rendering a file is no longer the default 2015-02-27 17:00:41 +01:00
Faldrian
913d9827e7 Added support for environment-variable to specify firefox-binary for selenium-testing 2015-01-24 16:24:20 +01:00
Jonne Haß
c7047fbe8f cleanup features/support 2014-12-08 04:55:56 +01:00
Jonne Haß
3a92efbfaf drop deferred garbage collection 2014-12-08 04:51:06 +01:00
Jonne Haß
1c7e5b7026 Improve apend_to_publisher
- Use custom matcher that polls #value of the element
- Wait for the text field to become visible before entering text
2014-12-04 22:16:47 +01:00
Jonne Haß
7e4504edf2 Give the browser time to actually load the page before expecting to be
on it
2014-12-04 18:13:56 +01:00
Dennis Schubert
339111867e Merge pull request #5443 from jhass/spring
Replace spork with spring, update & use binstubs
2014-12-04 00:38:30 +01:00
Steffen van Bergerem
b3f7acb91b Fix SlowFinderErrors 2014-12-03 22:31:02 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs
Spring is the recommended application preloader for rails
2014-12-01 08:06:07 +01:00
Steffen van Bergerem
8275e6ba54 Improve append to publisher spec 2014-12-01 02:57:55 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Steffen van Bergerem
2b72fd0f35 Remove tests for removed beta code 2014-10-10 03:49:56 +02:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
fe0f8df9c9 add a 'css mutex' for cuke failures 2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
khall
875895f2d0 Convert specs to RSpec 3.0.4 syntax with Transpec
This conversion is done by Transpec 2.3.6 with the following command:
    transpec features

* 19 conversions
    from: obj.should
      to: expect(obj).to

* 1 conversion
    from: == expected
      to: eq(expected)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2014-08-26 17:11:44 -07:00
khall
de3e0bd91a Updating cucumber features 2014-08-26 17:11:44 -07:00
Jonne Haß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +02:00
op48
844fe9d6b9 Allow users to delete own photos from gallery
Added delete label to photos in gallery

added an event to delete photos of current user

Added css for hiding/revealing the delete label

Included the photo stylesheet

Added cucumber test for deleting your own photos

Removed wip
2014-08-19 10:11:06 +01:00
Florian Staudacher
7680165b14 cleanup some publishing/posting cukes, hopefully stabilizing them 2014-04-22 03:28:06 +02:00
Florian Staudacher
19687c32a4 fix race condition in cukes 2014-04-21 21:01:27 +02:00
Jason Robinson
7d9248b7ac Merge pull request #4854 from Flaburgan/fix-mobile-drawer
Fix mobile drawer
2014-04-12 21:46:54 +03:00
flaburgan
86e71cd1b6 fix registration test 2014-04-11 20:25:58 +02:00
goobertron
63abe9055b Reorder items on settings page and improve wording
Update cukes to be text-independent
Update changelog
2014-04-08 00:28:25 +01:00
Florian Staudacher
1f98e1c639 cleanup 'getting started' cukes a bit 2014-02-23 16:48:48 +01:00
Florian Staudacher
e2adaa07a2 should fix remaining failing cukes from captcha and removal of client-side-validations gem 2014-02-23 16:48:48 +01:00
Jonne Haß
8b8071925d Make toggle aspect call synchronous and bump capybaras wait timeout
in features/desktop/aspect_navigation.feature:18 we quickly leave the page
before waiting for the request to finish. By making the HTTP call
synchronous we wait for it to finish before we reflect the change in the DOM,
thus giving Capybara a chance to wait for it. Also let Capybara wait longer.
This should random failures of the aforementioned cuke rarer.
2014-01-26 00:13:06 +01:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
2014-01-16 23:23:30 +01:00
Fabian Rodriguez
ea58324aa8 remove template picker 2013-12-04 20:08:54 -02:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401)
invalidate empty posts when created by a local user

add changelog entry
2013-09-24 21:57:22 +02:00
Fabian Rodriguez
7b65fdf77c add missing shoulds 2013-09-14 13:46:41 -03:00
Fabian Rodriguez
261ac786c1 avoid use :visible option in capybara finders 2013-08-27 10:59:44 -03:00
Roger Braun
d7aaaea86e Fix specs for new single post view. 2013-08-22 09:56:35 +02:00
carolina
fd05d30f20 Add tests for photo link in profile side bar 2013-08-19 12:49:39 +02:00
Jonne Haß
274faebdd1 another attempt at stabilizing features/signs_up.feature 2013-08-04 17:01:12 +02:00
Jonne Haß
300752fc87 bump capybara
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
2013-07-31 01:47:23 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02: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ß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01: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
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
Devendra
7c4c11f8d6 Refactored cucumber features, steps, and support helpers for change password feature 2012-08-07 21:23:20 +05:30
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
Dennis Collinson
fe0156a18b cuking out new stream, refactors. 2012-05-21 15:14:23 -07:00
Florian Staudacher
9b563e39da fix login cukes 2012-05-19 22:29:12 +02: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
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
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
979eb66e44 added tests for flash messages on reshares 2012-04-27 19:23:30 +02: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
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
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
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
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
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
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
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00