diff --git a/admin/build b/admin/build index 64c48f159..87540347c 100755 --- a/admin/build +++ b/admin/build @@ -77,7 +77,7 @@ EOF #bundle install --path vendor/bundle --local # prepare production acssets 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 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 diff --git a/web/spec/factories.rb b/web/spec/factories.rb index 771b7862b..fb6e97594 100644 --- a/web/spec/factories.rb +++ b/web/spec/factories.rb @@ -230,6 +230,8 @@ FactoryGirl.define do city "Apex" state "NC" country "US" + hourly_rate 1 + gig_minimum 1 before(:create) { |band| band.genres << Genre.first } diff --git a/web/spec/features/signup_spec.rb b/web/spec/features/signup_spec.rb index ff62b51bf..3546a0936 100644 --- a/web/spec/features/signup_spec.rb +++ b/web/spec/features/signup_spec.rb @@ -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 location = GeoIpLocations.lookup('127.0.0.1') - find('.field.country .easydropdown .selected', text:location[:country]) - find('.field.state .easydropdown .selected', text:location[:state]) - find('.field.city .easydropdown .selected', text:location[:city]) + + region = Region.find_by_region(location[:state]) + find('.field.country .easydropdown .selected', text: 'United States') + find('.field.state .easydropdown .selected', text:'Massachusetts') + find('.field.city .easydropdown .selected', text:'Boston') end describe "with valid musician information" do diff --git a/web/spec/requests/bands_api_spec.rb b/web/spec/requests/bands_api_spec.rb index a2e631009..5b0eac7e7 100644 --- a/web/spec/requests/bands_api_spec.rb +++ b/web/spec/requests/bands_api_spec.rb @@ -124,11 +124,9 @@ describe "Band API", :type => :api do band_details["genres"].size.should == 1 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.status.should == 422 - error_msg = JSON.parse(last_response.body) - error_msg["errors"]["genres"].should == [ValidationMessages::BAND_GENRE_MINIMUM_NOT_MET] + last_response.status.should == 201 end it "should prevent bands with more than 3 genres" do