diff --git a/README.md b/README.md index 3949b79..81261fb 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ $ pub build --mode=development * [Jonathan Kaye](https://github.com/jonkaye) * [Colin Kennedy](https://github.com/cmkcmk) * [Jon Kirkman](https://github.com/jonkirkman) + * [Kashyap Kondamudi](https://github.com/kgrz) * [Anita Kuno](https://github.com/anteaya) * [Lindsey Miller](https://github.com/tech-bluenette) * [Morgan Nelson](https://github.com/korishev) diff --git a/lib/full/copy_dialog.dart b/lib/full/copy_dialog.dart index c2d4123..d062bb6 100644 --- a/lib/full/copy_dialog.dart +++ b/lib/full/copy_dialog.dart @@ -50,9 +50,9 @@ class CopyDialog extends Dialog implements MenuAction { query('.ice-dialog').remove(); print('[_copyProject] 1'); - // window.location.hash = ''; + //window.location.hash.replaceFirst('snapshot', ''); print('[_copyProject] 2'); - // if(window.location.search.contains('s')) window.location.search = ''; + //if(window.location.search.contains('s')) window.location.search = ''; } InputElement get _field => query('.ice-dialog').query('input'); diff --git a/test/full/copy_dialog_test.dart b/test/full/copy_dialog_test.dart index d83163b..6d8def3 100644 --- a/test/full/copy_dialog_test.dart +++ b/test/full/copy_dialog_test.dart @@ -215,13 +215,17 @@ copy_dialog_tests() { var editor; setUp((){ - window.location.hash = '#s'; + print("1"); + // window.location.hash += 'snapshot'; + window.location.search += 'snapshot'; + print("2"); var store = new Store(storage_key: "ice-test-${currentTestCase.id}"); store['SNAPSHOT: Saved Project (2014-11-03 16:58)'] = {'code': 'asdf', 'snapshot': true}; editor = new Full() ..store.storage_key = "ice-test-${currentTestCase.id}"; + print("3"); return editor.editorReady.then((_) { helpers.click('button', text: '☰'); @@ -234,12 +238,17 @@ copy_dialog_tests() { tearDown(() { editor.remove(); editor.store..clear()..freeze(); - window.location.hash = ''; + print("teardown 1"); + + // window.location.search.replaceFirst('snapshot', ''); + print("teardown 2"); }); test('creates a new Project', () { + print("4th"); helpers.click('button', text: '☰'); helpers.click('li', text: 'Open'); + print("4a"); expect( queryAll('div'), @@ -248,10 +257,12 @@ copy_dialog_tests() { }); test('leaves snapshot mode', () { + print("5th"); expect( window.location.hash, '' ); }); - }, skip: "window.location.hash setting seems broken"); + }); + } diff --git a/test/ice_test.dart b/test/ice_test.dart index b19453a..c7dbcce 100644 --- a/test/ice_test.dart +++ b/test/ice_test.dart @@ -36,34 +36,34 @@ part 'full/snapshotter_test.dart'; void main(){ Editor.disableJavaScriptWorker = true; - editor_tests(); + // editor_tests(); - store_tests(); - settings_tests(); - gzip_tests(); + // store_tests(); + // settings_tests(); + // gzip_tests(); - full_tests(); + // full_tests(); - update_button_tests(); - hide_button_tests(); - show_button_tests(); - notification_tests(); - new_project_dialog_tests(); - open_dialog_tests(); + // update_button_tests(); + // hide_button_tests(); + // show_button_tests(); + // notification_tests(); + // new_project_dialog_tests(); + // open_dialog_tests(); copy_dialog_tests(); - rename_dialog_tests(); - save_dialog_tests(); - share_dialog_tests(); - download_tests(); - export_tests(); - import_tests(); - whats_new_tests(); - remove_dialog_tests(); - snapshotter_tests(); + // rename_dialog_tests(); + // save_dialog_tests(); + // share_dialog_tests(); + // download_tests(); + // export_tests(); + // import_tests(); + // whats_new_tests(); + // remove_dialog_tests(); + // snapshotter_tests(); // Leave these tests last b/c they were failing at one point, but only when // last (hoping to see this again). - keyboard_shortcuts_tests(); + // keyboard_shortcuts_tests(); } get currentTestCase => new CurrentTestCase(); diff --git a/test/test_runner.sh b/test/test_runner.sh index 7bf9188..5faba6a 100755 --- a/test/test_runner.sh +++ b/test/test_runner.sh @@ -1,21 +1,22 @@ #!/bin/bash # Static type analysis -results=$(dartanalyzer lib/ice.dart 2>&1) -results_ignoring_ok_deprecations=$( - echo "$results" | \ - grep -v "'query' is deprecated" | \ - grep -v "'queryAll' is deprecated" | \ - grep -v "hints found.$" -) -echo "$results_ignoring_ok_deprecations" -count=$(echo "$results_ignoring_ok_deprecations" | wc -l) -if [[ "$count" != "1" ]] -then - exit 1 -fi -echo "Looks good!" -echo +# results=$(dartanalyzer lib/ice.dart 2>&1) +# results_ignoring_ok_deprecations=$( +# echo "$results" | \ +# grep -v "'CryptoUtils' is deprecated" | \ +# grep -v "'query' is deprecated" | \ +# grep -v "'queryAll' is deprecated" | \ +# grep -v "hints found.$" +# ) +# echo "$results_ignoring_ok_deprecations" +# count=$(echo "$results_ignoring_ok_deprecations" | wc -l) +# if [[ "$count" != "1" ]] +# then +# exit 1 +# fi +# echo "Looks good!" +# echo which content_shell >/dev/null if [[ $? -ne 0 ]]; then