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

585 commits

Author SHA1 Message Date
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