seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* wip

This commit is contained in:
Seth Call 2015-07-15 07:36:08 -05:00
parent 583dec1bd3
commit eb5b541a05
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/build
View File

@ -77,7 +77,7 @@ EOF
#bundle install --path vendor/bundle --local #bundle install --path vendor/bundle --local
# prepare production acssets # prepare production acssets
rm -rf $DIR/public/assets rm -rf $DIR/public/assets
bundle exec rake assets:precompile RAILS_ENV=production #bundle exec rake assets:precompile RAILS_ENV=production
# create debian using fpm # create debian using fpm
bundle exec fpm -s dir -t deb -p target/deb/jam-admin_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "jam-admin" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/jam-admin --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile .bundle config Rakefile script config.ru lib public vendor app BUILD_NUMBER bundle exec fpm -s dir -t deb -p target/deb/jam-admin_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "jam-admin" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/jam-admin --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile .bundle config Rakefile script config.ru lib public vendor app BUILD_NUMBER

2
web/spec/factories.rb
View File

@ -230,6 +230,8 @@ FactoryGirl.define do
city "Apex" city "Apex"
state "NC" state "NC"
country "US" country "US"
hourly_rate 1
gig_minimum 1
before(:create) { |band| before(:create) { |band|
band.genres << Genre.first band.genres << Genre.first
} }

8
web/spec/features/signup_spec.rb
View File

@ -27,9 +27,11 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
# we should see these locations in the signup form already chosen # we should see these locations in the signup form already chosen
location = GeoIpLocations.lookup('127.0.0.1') location = GeoIpLocations.lookup('127.0.0.1')
find('.field.country .easydropdown .selected', text:location[:country])
find('.field.state .easydropdown .selected', text:location[:state]) region = Region.find_by_region(location[:state])
find('.field.city .easydropdown .selected', text:location[:city]) find('.field.country .easydropdown .selected', text: 'United States')
find('.field.state .easydropdown .selected', text:'Massachusetts')
find('.field.city .easydropdown .selected', text:'Boston')
end end
describe "with valid musician information" do describe "with valid musician information" do

6
web/spec/requests/bands_api_spec.rb
View File

@ -124,11 +124,9 @@ describe "Band API", :type => :api do
band_details["genres"].size.should == 1 band_details["genres"].size.should == 1
end end
it "should prevent bands with less than 1 genre" do it "will allow bands with 0 genres" do
last_response = create_band(user, genres: []) last_response = create_band(user, genres: [])
last_response.status.should == 422 last_response.status.should == 201
error_msg = JSON.parse(last_response.body)
error_msg["errors"]["genres"].should == [ValidationMessages::BAND_GENRE_MINIMUM_NOT_MET]
end end
it "should prevent bands with more than 3 genres" do it "should prevent bands with more than 3 genres" do