Commit graph

1144 commits

Author SHA1 Message Date
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
Raphael Sofaer
46ef376bc1 Fix notifications feature 2011-07-06 19:00:29 -07:00
Raphael Sofaer
19911bc856 Fix cucumber on my computer 2011-07-05 19:23:58 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
06abdce180 Use explicit classes in the hover step definition 2011-07-05 15:33:34 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
0ab961e096 tags controller fixed 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
027f096ca7 turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
77d28b4117 wip following tags 2011-07-05 15:03:26 -07:00
danielgrippi
956a86b401 publisher rework 2011-07-05 15:03:26 -07:00
Raphael Sofaer
84eb8a7063 Render a little bit less in the IntegrationSessionsController 2011-07-04 16:07:05 -07:00
Raphael Sofaer
24ece551f9 Do one step def in capybara rather than JS 2011-07-04 16:04:59 -07:00
Raphael Sofaer
7aefe37de8 Reenable notifications feature, don't use javascript in step definitions if you can avoid it? 2011-07-04 15:38:15 -07:00
Raphael Sofaer
fa3cdeb8cb Remove a few unused cucumber steps 2011-07-04 12:05:09 -07:00
Raphael Sofaer
4e1e8fdb80 Get rid of 'bogus ps syntax' maybe figure out why 1.9 is freaking out about the oauth steps 2011-07-04 09:49:50 -07:00
Raphael Sofaer
b64ba85878 Apparently running a regex against every element on the page takes 10 seconds. Who knew? 2011-07-04 09:19:03 -07:00
Raphael Sofaer
04f8abcf13 Check for all aspects in selected_contacts link switch, take out a couple extra steps 2011-07-04 08:39:07 -07:00
Raphael Sofaer
a715630471 make cucumber faster by logging in through a much simpler stubby controller. Save about 1m on my laptop. 2011-07-04 08:11:12 -07:00
danielgrippi
1cd3ef4971 comment out a notifications feature for now that seems to break cucumber. what it's testing is kind of already asserted in the previous feature. thoughts? 2011-07-04 01:58:47 -07:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
Raphael Sofaer
98799b3971 Make feature a little prettier 2011-07-02 14:20:57 -07:00
Raphael Sofaer
290fb1e7f5 Cut 45 seconds out of the comments feature by using factories 2011-07-02 13:40:30 -07:00
Raphael Sofaer
11e5057e52 Adjust cukes 2011-07-01 23:41:22 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -07:00
Sarah Mei
948a7c5d55 DH SM MS Fix showing image in the publisher when it gets uploaded 2011-06-30 20:36:15 -07:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
02489bb7cf This should fix CI for real 2011-06-29 12:07:10 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
63125cb9b9 Fixed the oauth cucumber features 2011-06-23 16:03:36 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Ilya Zhitomirskiy
78253b6885 resetting the token instead if the app already exists, should move the lookup to be homepage url 2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491 green on all the cucumbers WOOT 2011-06-14 18:30:43 -07:00
Ilya Zhitomirskiy
ef0e48a7ff A user can now revoke an application's token iz ms 2011-06-13 16:48:52 -07:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
Raphael Sofaer
6d5169d707 Chubbies is working with local diaspora-client gem 2011-06-09 15:01:09 -07:00
danielgrippi
67eaafe3a9 Chubbies no longer saves diaspora_handle from the browser 2011-06-06 15:42:58 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d chubbies tests mow take diaspora handle 2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d Chubbies now sees that it has no secret and registers itself. 2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
Maxwell Salzberg
149c086d5e make the tumblr posting smarter 2011-06-02 17:02:29 -07:00
Maxwell Salzberg
6e3fcdd893 fixed build 2011-06-02 16:25:32 -07:00
Dan Hansen
0edc160007 Clean up stream.js, make the comments step selector more sane 2011-05-31 15:52:17 -05:00
Raphael Sofaer
286f1b876d Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions. 2011-05-20 15:14:23 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow
Conflicts:
	features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
Sarah Mei
00d89b0207 Small updates to infinite scroll feature 2011-05-14 16:58:37 -07:00
danielgrippi
ee49fb3547 no more n-query in the view problem 2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410 Finish fixing password changing and keeping emails downcased 2011-05-13 16:32:07 -07:00
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -07:00
danielgrippi
c67d143719 dropdown in ContactsController#sharing now works 2011-05-11 15:47:13 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07:00
danielgrippi
f6765324da likes cucumber, rspec green 2011-05-11 11:08:30 -07:00
Raphael Sofaer
160e01f7bd Fix broken sorting by activity 2011-05-07 00:50:26 -04:00
Dan Goldenberg
f1f0d6e2ea added cuc test for commenting on a status message show page 2011-05-06 15:12:46 -07:00
Raphael Sofaer
fa174f8eb2 Cukes for posting a photo with and without text 2011-05-06 16:46:45 -04:00
danielgrippi
648a10e6d3 Merge branch 'master' into follow
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Raphael Sofaer
bc8b6097bc Update infinite scroll plugin for $.fn.infinitescroll.destroy 2011-05-02 14:08:41 -07:00
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
Sarah Mei
ae3deb1f32 Theory: embedder.feature breaks CI because it assumes the browser can show video. 2011-04-29 19:53:27 -07:00
Sarah Mei
e025b14b60 Logout: still not a word. 2011-04-29 19:44:57 -07:00
Raphael Sofaer
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
Raphael Sofaer
948725b946 Fix infinite scroll after changing aspects 2011-04-26 18:26:12 -07:00
Raphael Sofaer
2517653d34 Red feature for infinite scroll after changing aspects 2011-04-26 17:28:42 -07:00
Raphael Sofaer
24ea518b6f Fix some JS bugs, delegate doesn't work if you remove the element 2011-04-25 16:15:33 -07:00
Raphael Sofaer
9940f19962 Test and fix embedder after changing aspects 2011-04-25 12:24:38 -07:00
MrZYX
45d621a9e6 fixed embedder the hacky way (?) and added cucumber feature for youtube feature so you'll notice if you breakt it again the next time 2011-04-21 15:42:28 +02:00
danielgrippi
352d1c6abf fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
danielgrippi
b22b13d73f Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
This reverts commit 326155af54.
2011-03-31 01:30:02 -07:00
danielgrippi
326155af54 popstate now in aspect-filters. back button now actually works on aspect/index. 2011-03-30 17:39:08 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc wip holding off until the follow model is done 2011-03-30 16:43:28 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
zhitomirskiyi
d54a8428d3 add some limits for conversation#new 2011-03-29 15:19:14 -07:00
zhitomirskiyi
4b2364e893 MS profile update from getting started fixed 2011-03-29 15:03:10 -07:00
Sarah Mei
59650c8104 Refactor saved state cucumber feature to be more consistent. (It was occasionally failing locally due to a timing issue.) 2011-03-27 18:32:11 -07:00
MrZYX
40810741f3 fixed cucumber 2011-03-27 22:04:36 +02:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
fb5bc2805d fix cucumber 2011-03-23 12:42:07 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names.
Moved some logic from view into user model.
2011-03-22 13:16:58 -07:00
zhitomirskiyi
058b74846a removed the bring your friends message from the stream 2011-03-21 15:23:34 -07:00
MrZYX
495465f3a4 fixed cucumber 2011-03-20 18:35:42 +01:00
Sarah Mei
8d7aa1826c Reorder some steps in the comments feature to make it more consistent. 2011-03-19 22:08:11 -07:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
Sarah Mei
1bd693eb14 Added cucumber step for searching, and feature for searching for tags. 2011-03-19 19:06:24 -07:00
Sarah Mei
a8737ab318 Publisher modal cucumber step is now officially insane. Or is that me? 2011-03-19 18:19:37 -07:00
Sarah Mei
b0ca6ead26 Fix append cucumber step to trigger keyup, so that it always copies the text from the placeholder input to the real input. 2011-03-19 15:59:13 -07:00
maxwell
f4c482cdb3 make the photo downloaders wip to save mrzyx some emails untill we work it out 2011-03-17 18:40:26 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
maxwell
1de52d3ba2 fixed failing cucumber 2011-03-17 13:59:53 -07:00
zhitomirskiyi
3d34e3bd35 publishing from a person profile page wip
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
2011-03-17 10:56:58 -07:00
Kiran Soumya
6d113da242 Bug Fix:868 for Users unable to download photos 2011-03-17 01:14:05 +05:30
danielgrippi
68479481cf made websockets far less dumb. don't render partials for people not connected. 2011-03-15 18:21:09 -07:00
danielgrippi
3bbc766abc fixed cucumber tests 2011-03-15 13:38:13 -07:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
Raphael Sofaer
3c1b5a10df Fix cucumber features for text instead of message 2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
Michael Nutt
9d1bb3ac21 fix feature for new markup 2011-03-10 16:42:07 -05:00
Michael Nutt
2b6070d325 features for comments 2011-03-10 16:42:07 -05:00
Sarah Mei
5a23907143 Fix cucumber feature for deleting posts. 2011-02-19 22:35:10 -08:00
MrZYX
cc84e349de fixed cucumber for cd7e4d6e8f 2011-02-18 13:36:24 +01:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
zhitomirskiyi
9f239789b9 can remote the person from the last aspect from edit contact pane 2011-02-11 12:58:01 -08:00
zhitomirskiyi
4105f90aaa forgot to add 2011-02-09 19:07:02 -08:00
zhitomirskiyi
1da965616b added an option to remove a contact from the last aspect, after a prompt 2011-02-09 17:47:27 -08:00
Raphael Sofaer
aaaa00f1c9 Fix cucumber features 2011-02-09 16:34:03 -08:00
zhitomirskiyi
eecf1d5d82 fixed cucumber, localization, and css 2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial"
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
df4ebb286d accept invitation feature passing
wip, added a form to add aspect to the contact list

added files

typo

render the partial

remote friend

specifying the provider for the route

refactored local person person friend finder functionality to use the partial

typo

trying to use the stream
2011-02-08 16:40:28 -08:00
zhitomirskiyi
a398184081 WIP 2011-02-08 16:35:33 -08:00
zhitomirskiyi
1fbcb3c3e5 added a special case for share bc js being slow 2011-02-03 16:16:45 -08:00
Raphael
636242283b Fix cucumber features 2011-02-02 18:49:45 -08:00
Sarah Mei
e7cf5fc841 Fix/expand cucumber feature for new user signup.
Replace "wait for aspects page"-type steps with general wait for step.
2011-02-02 17:17:00 -08:00
Raphael
cd8d9989cf Refactor publisher JS, use hidden field for submitting 2011-02-02 14:27:14 -08:00
Sarah Mei
b84836ed95 Merging close_account.feature and closes_account.feature 2011-02-02 14:22:07 -08:00
Raphael
ff3f376c07 Fix cucumber feature 2011-02-02 11:56:39 -08:00
zhitomirskiyi
6694485388 added the cucumber feature back in 2011-02-01 18:13:48 -08:00
Raphael
cfd6639f4d Revert "Merge branch 'open-aspects'"
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
2011-02-01 13:15:20 -08:00
zhitomirskiyi
181bd823c4 Merge branch 'open-aspects' 2011-02-01 12:10:12 -08:00
zhitomirskiyi
55403d9bea the saved aspects works properly now 2011-02-01 12:07:18 -08:00
maxwell
2c3ed2ab73 making this feature fail because the publisher is not shown, by rendering this test in a browser 2011-02-01 10:09:50 -08:00
MrZYX
9600378178 Merge branch 'cucumber_fixes' of https://github.com/dangold1138/diaspora 2011-02-01 17:01:55 +01:00
maxwell
aeb33432af Revert "WIP"
This reverts commit 8898650842.
2011-01-31 21:41:23 -08:00
maxwell
7bb7bb396a Revert "persists open aspects across logins also fixed the status message controller spec broken in master"
This reverts commit 9e7f03236e.
2011-01-31 21:41:05 -08:00
Dan Goldenberg
2567a9441e Added notification.feature 2011-01-31 18:42:34 -08:00
Dan Goldenberg
58bc4f7387 fixed the viewing a requests profile scenario 2011-01-31 18:42:34 -08:00
zhitomirskiyi
9e7f03236e persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:37:20 -08:00
zhitomirskiyi
8898650842 WIP 2011-01-31 18:37:20 -08:00
zhitomirskiyi
789ff679a9 persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:31:41 -08:00
zhitomirskiyi
a68bdd6118 WIP 2011-01-31 15:52:56 -08:00
Dan Goldenberg
63e2ef4a31 Fixed yogurt spelling 2011-01-31 00:49:41 -08:00
zhitomirskiyi
5940292840 build should be green now 2011-01-28 21:21:14 -08:00
zhitomirskiyi
3f42c5bdb9 fixed cucumber features 2011-01-28 11:26:08 -08:00
MrZYX
bd6617ea55 Merge branch 'added_feature_close_account' of https://github.com/jairodiaz/diaspora 2011-01-27 19:22:31 +01:00
Dan Goldenberg
30baff22ea Added close_account feature and added scenarios to other features 2011-01-26 23:39:59 -08:00
Raphael
c57ef8853c un-wip delete post feature 2011-01-26 10:50:26 -08:00
Raphael
f3e655b10d Make disruptive cucumber feature wip 2011-01-25 18:25:33 -08:00
maxwell
6b12c55278 fix cucumber failure 2011-01-25 14:07:17 -08:00
Raphael
2e50375eed Pretty sure that this delete a post feature is broken 2011-01-24 18:53:48 -08:00
danielvincent
6eb208adb5 fixed cucumber feature to reflect ui change in publisher 2011-01-22 20:04:59 -08:00
maxwell
465dd9ba96 check to see if rails is already loaded in a couple of places 2011-01-19 13:30:12 -08:00
Miguel Diaz
482f0bd91d Added new feature test: closes account 2011-01-15 20:34:01 -05:00
root
4bc061117a Private Issue - Cucumber test for closing an account 2011-01-15 16:46:10 -05:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Sarah Mei
b865c20b2d Backing out sub-uri changes 2011-01-09 18:29:43 -08:00
Alec Leamas
e01fb62eeb Expose and refer to assets on the sub_uri.
When using sub-uri, create a symlink in public/ making the assets
available at the sub-uri. Modify environment.rb so that asset paths
refers to this sub-uri path. Closes http://bugs.joindiaspora.com/issues/391
and http://bugs.joindiaspora.com/issues/737 when application mounted
on suburi (i. e., prev patch)
2011-01-09 23:38:03 +01:00
danielvincent
6cc5d6e3ab fixed all rspec/cucumber 2011-01-08 16:53:16 -08:00
danielvincent
c74dc120df fixed all cucumber tests 2011-01-08 13:11:54 -08:00
Sarah Mei
9411ba31b0 Reduce spurious cucumber failures by turning off jquery effects with drag & drop, and increasing timeout when waiting for ajax callbacks to complete. 2011-01-08 12:58:43 -08:00
Jairo Diaz
d0c1c087f4 removed @wip tag in feature to avoid clash with others 2011-01-07 10:27:47 -05:00
Jairo Diaz
524149c9b2 Added test for changing password 2011-01-07 10:21:52 -05:00
Raphael
64c31af529 GREEN 2010-12-29 11:18:10 -08:00
Alec Leamas
8d218e7871 suburi cucumber test.
Adds the features/uri-features test directory, testing sub-uri
deployment. These tests uses script/server since much of this code is
about configuring the server.  They are not run by "rake cucumber", to
run them use "bundle exec rake cucumber features/uri-test".

Tests requires a working app_config.yml setup with pod_url =
"http://localhost:3000/diaspora"

Patches cucumber.yml to always load step definitions from features/**, see
http://thoughtsincomputation.com/posts/cucumber-step-definitions-and-autorequire-hell
2010-12-29 10:31:25 +01:00
Sarah Mei
2184af09d9 Patch database_cleaner to actually, you know, work. 2010-12-28 22:23:27 -08:00
Sarah Mei
fd74b79b61 do clean before each scenario so db doesn't get into borked state 2010-12-28 20:58:16 -08:00
Sarah Mei
c1e036d4f7 Merge branch 'mysql' of github.com:diaspora/diaspora into mysql 2010-12-28 20:04:34 -08:00
Sarah Mei
6f1aee990c Database is cleaned between scenarios. Progress? 2010-12-28 20:03:58 -08:00
zhitomirskiyi
ddf95e2750 couple more passing cucumber stories, changed the queries on request and notification 2010-12-28 19:14:47 -08:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
34b5566333 Merge branch 'mysql' of github.com:diaspora/diaspora into mysql 2010-12-26 20:37:28 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Sarah Mei
0e2fa40539 cucumber not quite as jacked on mysql 2010-12-26 12:46:48 -08:00
Michael Sofaer and Raphael Sofaer
7175200779 Fix a spec, need to move to a computer with firefox. 2010-12-24 15:17:24 -08:00
Sarah Mei
9c50f900ed Merry Christmas! I got you someting green.
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
2010-12-24 14:14:24 -08:00
danielvincent
c17425b7fb fixed one cuke 2010-12-21 10:09:46 -08:00
maxwell
43824c4b33 pushing for dan 2010-12-20 18:45:23 -08:00
danielvincent
ee9e187e5c fixed build, add photos has a solid border 2010-12-18 19:45:50 -08:00
Raphael
b22398951e Send requests from the aspect list on the person show page 2010-12-15 14:48:14 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
Raphael
251cdec2ec Add full request cycle cucumber feature 2010-12-14 17:11:42 -08:00
Raphael
2c141baf78 Capitalization... 2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d Correctly stub the websocket redis method 2010-12-10 11:53:18 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
Raphael
c320dae589 Add a cuke for being invited by someone 2010-12-05 00:15:37 -08:00
Raphael
c09c060ebb Beginning of user invitation acceptance feature 2010-12-04 23:07:52 -08:00
Sarah Mei
713c98ce51 don't require redis for cucumber 2010-12-03 20:49:41 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
sentientwaffle
bb8433f4fe Added features for posting to all or single aspects 2010-11-30 18:09:14 -08:00
MrZYX
4f67b72801 fixed build 2010-11-26 15:52:39 +01:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
maxwell
40cc829419 fixing final cucumber spec 2010-11-21 16:53:09 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
Sarah Mei
92c508bb36 Silence warnings on ruby 1.9 build 2010-11-20 19:08:36 -08:00
Sarah Mei
1309ee37dc more work on the feature for ignoring a contact request 2010-11-20 12:16:18 -08:00
Raphael
47dc91fae4 Make link to getting started page in cucumber feature work 2010-11-18 11:16:18 -08:00
Matt Baker
b2e6caafed Don't show skip link if user.getting_started == false 2010-11-18 11:16:18 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
Sarah Mei
2949dd8796 cucumber feature for accepting a contact request. 2010-11-17 21:34:47 -08:00
danielvincent
1a9041a3c0 DG MS; fixed cucumber tests to work with new landing page flow 2010-11-17 19:49:01 -08:00
Sarah Mei
686cea6595 1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9. 2010-11-15 21:52:02 -08:00
Sarah Mei
0b12c4e272 Cucumber user by default is done with getting started. 2010-11-15 21:06:45 -08:00
Sarah Mei
23c1ac4936 Cucumber feature for managing contact requests 2010-11-14 21:49:56 -08:00
Sarah Mei
830a43ec2f Add destroy specs for RequestsController.
Cucumber feature for contact requests.
2010-11-14 09:43:28 -08:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Sarah Mei
e282abd526 cucumber feature for user authentication. 2010-11-01 22:22:35 -07:00
Raphael
cc521261c8 Forgot to change spelling in feature 2010-11-01 00:55:16 -07:00
Sarah Mei
9594e11ded Add feature for skipping the setup wizard. 2010-10-31 22:50:20 -07:00
Sarah Mei
cb09249058 Refactor aspect cucumber feature - now happy path only. 2010-10-31 22:49:40 -07:00
Sarah Mei
8193f2e350 Adding the rest of the new user setup to cucumber.
wip scenario for skipping the profile wizard.
2010-10-31 20:05:15 -07:00
Sarah Mei
50efd27710 Removing webmock from cucumber - interferes with capybara (more investigation needed). 2010-10-31 20:04:24 -07:00
Sarah Mei
e69da7c5e8 Cucumber feature for user registration. 2010-10-31 17:50:03 -07:00
Sarah Mei
d32d47b790 work in progress cucumber feature for posting messages 2010-10-24 22:57:43 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af2.
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
Sarah Mei
8cf1b83662 cucumber feature closer to passing. 2010-10-19 22:29:07 -07:00
Raphael
eeea57d307 Case sensitivity... 2010-10-18 12:43:04 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Stephen Caudill
8d17b3537c Refactor to use a Background 2010-09-26 14:18:58 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
Stephen Caudill
5f2d4ba073 Use the mongo_mapper and cucumber Cleaner strategy 2010-09-26 11:35:50 -04:00
Stephen Caudill
9038d6b0ed Allow connections to be passed through to Selenium 2010-09-26 11:35:50 -04:00
Stephen Caudill
8a93c67166 Add the Hashrocket default step definitions
Tweaked for mongomapper and diaspora
2010-09-26 11:35:50 -04:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00